diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index edaad93ac..ff6588348 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ name: CI on: push: - branches: [ main ] + branches: [ basic-prep-test ] tags: ['*'] pull_request: branches: [ main ] @@ -40,61 +40,9 @@ jobs: # test code - run: npm run standard - run: npm run validate - - run: npm run c8 + # - run: npm run c8 # Test global install of the package - run: npm pack . - run: npm install -g solid-server-*.tgz # Run the Solid test-suite - run: bash test/surface/run-solid-test-suite.sh $BRANCH_NAME - - # TODO: The pipeline should automate publication to npm, so that the docker build gets the correct version - # This job will only dockerize solid-server@latest / solid-server@ from npmjs.com! - docker-hub: - needs: build - name: Publish to docker hub - if: github.event_name != 'pull_request' - runs-on: ubuntu-latest - steps: - - - uses: actions/checkout@v4 - - - uses: olegtarasov/get-tag@v2.1 - id: tagName - with: - tagRegex: "v?(?.*)" - - - name: Lint dockerfile - working-directory: docker-image - run: pwd && ls -lah && make lint - - - name: Run tests - working-directory: docker-image - run: SOLID_SERVER_VERSION=${{ steps.tagName.outputs.version }} make test - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v3 - with: - images: nodesolidserver/node-solid-server - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - context: ./docker-image/src - build-args: SOLID_SERVER_VERSION=${{ steps.tagName.outputs.version }} - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/test/surface/docker/server/Dockerfile b/test/surface/docker/server/Dockerfile index 300739334..ed91d6ab3 100644 --- a/test/surface/docker/server/Dockerfile +++ b/test/surface/docker/server/Dockerfile @@ -1,7 +1,7 @@ FROM node:latest ARG BRANCH=main RUN echo Testing branch ${BRANCH} of NSS -RUN git clone https://github.com/nodeSolidServer/node-solid-server +RUN git clone https://github.com/cxres/node-solid-server WORKDIR node-solid-server RUN git checkout ${BRANCH} RUN git status