better concurrency

centrifuge · Sep 14, 2023 · b275ad0 · b275ad0
1 parent bd713ed
commit b275ad0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/.github/actions/deploy-gfunction/action.yml b/.github/actions/deploy-gfunction/action.yml
@@ -13,10 +13,6 @@ inputs:
   deploy_env:
     description: env to deploy function to
     required: false
-
-  checkout_path:
-    description: Folder with repository code
-    required: true
 
   GWIP:
     description: Google Workflow Identity provider

diff --git a/.github/workflows/centrifuge-app.yml b/.github/workflows/centrifuge-app.yml
@@ -14,7 +14,7 @@ on:
         required: false
 # Fancy concurrency group string to allow for multi-staging deployments
 concurrency:
-  group: 'centrifuge-app-${{ inputs.deploy_env || github.event.inputs.deploy_env }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  group: 'centrifuge-app-${{ inputs.deploy_env || github.event.inputs.deploy_env }}@${{ github.event.name }}${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
   cancel-in-progress: true      
 env:
   artifact_name: "webpack${{ inputs.deploy_env && format('-{0}', inputs.deploy_env) }}"
@@ -94,7 +94,7 @@ jobs:
   deploy-app:
     concurrency:
        # Do not sync the same bucket in parallel
-      group: deploy-${{ needs.build-app.outputs.front_url }}
+      group: deploy-${{ needs.build-app.outputs.front_url }}-${{ github.event.name }}
       cancel-in-progress: true    
     permissions:
       contents: 'read'

diff --git a/.github/workflows/faucet-api.yml b/.github/workflows/faucet-api.yml
@@ -19,7 +19,7 @@ env:
   # deploy_to: ${{ inputs_deploy_env }}
   function_handler: faucet
 concurrency:
-  group: 'faucet-api@${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  group: 'faucet-api--${{ inputs.deploy_env || github.event.inputs.deploy_env }}@${{ github.event.name }}${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/onboarding-api.yml b/.github/workflows/onboarding-api.yml
@@ -18,7 +18,7 @@ env:
   artifact_name: "onboarding-api${{ inputs.deploy_env && format('-{0}', inputs.deploy_env) }}"
 concurrency:
  # Fancy concurrency group string to allow for multi-staging deployments  
-  group:  'onboarding-api-${{ inputs.deploy_env || github.event.inputs.deploy_env }} @${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  group:  'onboarding-api-${{ inputs.deploy_env || github.event.inputs.deploy_env }}@${{ github.event.name }}${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
   cancel-in-progress: true    
 
 jobs:
@@ -61,7 +61,7 @@ jobs:
   deploy-onboarding-api:
       concurrency:
        # Don't try to deploy the same function in parallel
-        group: deploy-${{ needs.build-onboarding-api.outputs.function_name }}
+        group: deploy-${{ needs.build-onboarding-api.outputs.function_name }}-${{ github.event.name}}
         cancel-in-progress: true  
       needs: build-onboarding-api
       runs-on: ubuntu-latest

diff --git a/.github/workflows/pinning-api.yml b/.github/workflows/pinning-api.yml
@@ -18,7 +18,7 @@ env:
   artifact_name: "pinning-api${{ inputs.deploy_env && format('-{0}', inputs.deploy_env) }}"
 concurrency:
  # Fancy concurrency group string to allow for multi-staging deployments  
-  group: 'pinning-api-${{ inputs.deploy_env || github.event.inputs.deploy_env }} @${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  group: 'pinning-api-${{ inputs.deploy_env || github.event.inputs.deploy_env }}@${{ github.event.name }}${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
   cancel-in-progress: true    
 jobs:
   build-pinning-api:
@@ -43,7 +43,7 @@ jobs:
         uses: ./.github/actions/build-function
         with:
           app_name: ${{ env.app_name }}
-          artifact_name: ${{ env.artifact_name }}
+          artifact_name: ${{ steps.prepare.outputs.function_name }}
 
       - name: Archive staging artifacts
         id: archive_staging
@@ -60,7 +60,7 @@ jobs:
   deploy-pinning-api:
     concurrency:
      # Don't try to deploy the same function in parallel
-      group: deploy-${{ needs.build-pinning-api.outputs.function_name }}
+      group: deploy-${{ needs.build-pinning-api.outputs.function_name }}-${{ github.event.name }}
       cancel-in-progress: true
     needs: build-pinning-api
     runs-on: ubuntu-latest
@@ -79,7 +79,7 @@ jobs:
         uses: ./apps/.github/actions/deploy-gfunction
         with:
           app_name: ${{ env.app_name }}
-          artifact_name: ${{ env.artifact_name }}
+          artifact_name: ${{ needs.build-pinning-api.outputs.function_name }}
           GWIP: ${{ secrets.GWIP }}
           GSA: ${{ secrets.GSA }}
           target: ${{ env.function_handler }}