ci: add de-duplicate steps in workflows

researchdata-sheffield · Jan 20, 2022 · fe69d7d · fe69d7d
1 parent 40ccb6a
commit fe69d7d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,21 +4,36 @@ on:
   push:
     branches-ignore: [ master ]
   pull_request:
-    branches: [ '**' ]
+    branches: [ 'master', 'development' ]
     types: [         
       opened,
       synchronize,
       reopened ]
   workflow_dispatch:
     inputs:
       Name:   
+        description: 'A name for this re-run'
         required: true
         default: 'Re-run the workflow'
       Description:
+        description: 'A description for this re-run'
+        required: false
         default: ''  
 
 jobs:
+  Check-Duplicate:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          skip_after_successful_duplicate: 'true'
+
   CI-Build:
+    needs: Check-Duplicate
+    if: ${{ needs.Check-Duplicate.outputs.should_skip != 'true' }}
     runs-on: windows-latest
     defaults:
       run:
@@ -71,6 +86,8 @@ jobs:
         run: npm run serve & npm run test:e2e
 
   Test:
+    needs: Check-Duplicate
+    if: ${{ needs.Check-Duplicate.outputs.should_skip != 'true' }}
     runs-on: windows-latest
     defaults:
       run:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -12,8 +12,6 @@
 name: "CodeQL"
 
 on:
-  push:
-    branches: [ development ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ development, master ]

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -8,9 +8,12 @@ on:
   workflow_dispatch:
     inputs:
       Name:   
+        description: 'A name for this re-run'
         required: true
         default: 'Re-run the workflow'
       Description:
+        description: 'A description for this re-run'
+        required: false
         default: ''  
 
 jobs:

diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -4,22 +4,37 @@ on:
   push:
     branches: [ development ]
   pull_request:
-    branches: [ '**' ] 
+    branches: [ 'master', 'development' ] 
     types: [        
       opened,
       synchronize,
       reopened ]
   workflow_dispatch:
     inputs:
       Name:   
+        description: 'A name for this re-run'
         required: true
         default: 'Re-run the workflow'
       Description:
+        description: 'A description for this re-run'
+        required: false
         default: ''  
 
 
 jobs:
+  Check-Duplicate:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          skip_after_successful_duplicate: 'true'
+
   scan:
+    needs: Check-Duplicate
+    if: ${{ needs.Check-Duplicate.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
 
     steps: