From 31fa5d14f9e03488a2dba0ef544b7fa22188c3d4 Mon Sep 17 00:00:00 2001
From: Robert Sese <robert.sese@gmail.com>
Date: Fri, 3 Sep 2021 14:59:01 -0500
Subject: [PATCH] Unique Docker workflows concurrency group (#21312)

* Unique concurrency group for Docker deploy

* Unique concurrency group for Docker deploy
---
 .github/workflows/staging-build-pr-docker.yml  | 4 ++--
 .github/workflows/staging-deploy-pr-docker.yml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/staging-build-pr-docker.yml b/.github/workflows/staging-build-pr-docker.yml
index 07f3658db4..74dfc4dabe 100644
--- a/.github/workflows/staging-build-pr-docker.yml
+++ b/.github/workflows/staging-build-pr-docker.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     concurrency:
-      group: staging_${{ github.head_ref }}
+      group: staging_docker_${{ github.head_ref }}
       cancel-in-progress: true
     steps:
       - name: Check out repo
@@ -49,7 +49,7 @@ jobs:
 
       # When there are changes to files we can't accept
       - name: 'Fail when not allowed files are changed'
-        if: ${{ steps.filter.outputs.notAllowed }}
+        if: ${{ steps.filter.outputs.notAllowed == 'true' }}
         run: exit 1
 
       - name: Create an archive
diff --git a/.github/workflows/staging-deploy-pr-docker.yml b/.github/workflows/staging-deploy-pr-docker.yml
index dd406c9b13..2b267b3c75 100644
--- a/.github/workflows/staging-deploy-pr-docker.yml
+++ b/.github/workflows/staging-deploy-pr-docker.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     concurrency:
-      group: staging_${{ github.event.workflow_run.head_branch }}
+      group: staging_docker_${{ github.event.workflow_run.head_branch }}
       cancel-in-progress: true
     outputs:
       source_blob_url: ${{ steps.build-source.outputs.download_url }}
@@ -149,8 +149,8 @@ jobs:
             const esm = require('esm')
             require = esm({})
 
-            const { default: createApp } = require('./script/create-app.js')
-            const { default: parsePrUrl } = require('./script/parse-pr-url.js')
+            const { default: createApp } = require('./script/deployment/create-app.js')
+            const { default: parsePrUrl } = require('./script/deployment/parse-pr-url.js')
 
             // This helper uses the `GITHUB_TOKEN` implicitly!
             // We're using our usual version of Octokit vs. the provided `github`
@@ -209,7 +209,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     concurrency:
-      group: staging_${{ github.event.workflow_run.head_branch }}
+      group: staging_docker_${{ github.event.workflow_run.head_branch }}
       cancel-in-progress: true
     steps:
       - name: Check out repo's default branch