diff --git a/.github/workflows/automerge.yml b/.github/disabled-workflows/automerge.yml similarity index 100% rename from .github/workflows/automerge.yml rename to .github/disabled-workflows/automerge.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 336c4191..6746667f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,9 +26,6 @@ jobs: npm ci BASE_URL=https://prismdb.takanakahiko.me npm start - - name: Configure docker to use the gcloud cli - run: gcloud auth configure-docker --quiet - - if: matrix.SERVICE_NAME == 'web' run: echo "BUILD_ARGS=--build-arg SPARQL_ENDPOINT_URL=${{ env.SPARQL_ENDPOINT_URL }}" >> $GITHUB_ENV diff --git a/.github/workflows/delivery.yml b/.github/workflows/delivery.yml index 2deefc2f..d68d708b 100644 --- a/.github/workflows/delivery.yml +++ b/.github/workflows/delivery.yml @@ -38,7 +38,7 @@ jobs: uses: google-github-actions/setup-gcloud@v1 - name: Configure docker to use the gcloud cli - run: gcloud auth configure-docker --quiet + run: gcloud auth configure-docker ${{env.GCP_REGION}}-docker.pkg.dev --quiet - if: matrix.SERVICE_NAME == 'web' run: echo "BUILD_ARGS=--build-arg SPARQL_ENDPOINT_URL=${{ secrets.SPARQL_ENDPOINT_URL }}" >> $GITHUB_ENV @@ -47,7 +47,7 @@ jobs: run: echo "BUILD_ARGS=--build-arg DBA_PASSWORD=${{ secrets.DBA_PASSWORD }}" >> $GITHUB_ENV - name: Set the docker image name - run: echo "IMAGE=asia.gcr.io/${{env.GCP_PROJECT}}/${{ matrix.SERVICE_NAME }}:${{ github.sha }}" >> $GITHUB_ENV + run: echo "IMAGE=${{env.GCP_REGION}}-docker.pkg.dev/${{env.GCP_PROJECT}}/prismdb/${{ matrix.SERVICE_NAME }}:${{ github.sha }}" >> $GITHUB_ENV - name: Build a docker image run: docker build ${{ matrix.SERVICE_NAME }} -t $IMAGE $BUILD_ARGS