Use service-name into regex. Add timeout for docker build job

blockscout · Jun 23, 2024 · 1b20e12 · 1b20e12
1 parent 7887af6
commit 1b20e12
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 61 deletions.
diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
@@ -16,6 +16,7 @@ on:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
+    timeout-minutes: 300
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -24,7 +25,7 @@ jobs:
         id: regex
         with:
           text: ${{ github.ref }}
-          regex: '^(refs\/tags\/visualizer\/(v\d+\.\d+\.\d+))|(refs\/heads\/(main))$'
+          regex: '^(refs\/tags\/${{ inputs.service-name }}\/(v\d+\.\d+\.\d+))|(refs\/heads\/(main))$'
 
       - name: Extract tag name
         id: tags_extractor

diff --git a/.github/workflows/visualizer.yml b/.github/workflows/visualizer.yml
@@ -36,7 +36,6 @@ jobs:
 #      always() &&
 #      (needs.test.result == 'success' || needs.test.result == 'cancelled') &&
 #      (needs.lint.result == 'success' || needs.lint.result == 'cancelled')
-#    timeout-minutes: 300
     uses: ./.github/workflows/docker-build-push.yml
     with:
       registry: ghcr.io
@@ -115,62 +114,3 @@ jobs:
 #
 #      - name: cargo clippy
 #        run: cargo clippy --all --all-targets --all-features -- -D warnings
-#
-#  push:
-#    name: Docker build and docker push
-#    needs:
-#      - test
-#      - lint
-#    if: |
-#      always() &&
-#      (needs.test.result == 'success' || needs.test.result == 'cancelled') &&
-#      (needs.lint.result == 'success' || needs.lint.result == 'cancelled')
-#    timeout-minutes: 300
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout repository
-#        uses: actions/checkout@v4
-#
-#      - uses: actions-ecosystem/action-regex-match@v2
-#        id: regex
-#        with:
-#          text: ${{ github.ref }}
-#          regex: '^(refs\/tags\/visualizer\/(v\d+\.\d+\.\d+))|(refs\/heads\/(main))$'
-#
-#      - name: Extract tag name
-#        id: tags_extractor
-#        run: |
-#          t=${{ steps.regex.outputs.group2 }}
-#          m=${{ steps.regex.outputs.group4 }}
-#          (if ! [[ "$t" == "" ]]; then echo tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:$t, ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest; elif ! [[ "$m" == "" ]]; then echo tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:$m; else echo tags=; fi) >> $GITHUB_OUTPUT
-#
-#      - name: Login to GitHub Container Registry
-#        uses: docker/login-action@v3
-#        with:
-#          registry: ${{ env.REGISTRY }}
-#          username: ${{ github.actor }}
-#          password: ${{ secrets.GITHUB_TOKEN }}
-#
-#      - name: Extract metadata for Docker
-#        id: meta
-#        uses: docker/metadata-action@v5
-#        with:
-#          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-#
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-#      - name: Build and push
-#        uses: docker/build-push-action@v5
-#        with:
-#          context: "visualizer"
-#          file: "visualizer/Dockerfile"
-#          build-contexts: |
-#            proto=proto
-#          push: ${{ steps.tags_extractor.outputs.tags != '' }}
-#          tags: ${{ steps.tags_extractor.outputs.tags }}
-#          # platforms: |
-#          #   linux/amd64
-#          #   linux/arm64/v8
-#          labels: ${{ steps.meta.outputs.labels }}
-#          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:build-cache
-#          cache-to: ${{ github.ref == 'refs/heads/main' && format('type=registry,ref={0}/{1}:build-cache,mode=max', env.REGISTRY, env.IMAGE_NAME) || '' }}