chore: minor tweaks

kleros · Aug 22, 2023 · 88d40d2 · 88d40d2
1 parent f588174
commit 88d40d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,6 +2,9 @@ name: "CodeQL Advanced"
 
 on:
   merge_group:  
+    branches:
+      - master
+      - dev
   push:
     branches:
       - master
@@ -20,8 +23,8 @@ permissions:
 jobs:
   codeql-advanced-analysis:
     name: Analyze
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 360
     permissions:
       actions: read
       contents: read
@@ -30,7 +33,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ "javascript"]
+        language:
+          - javascript
 
     steps:
     - name: Harden Runner

diff --git a/scripts/cancel-all-netlify-builds.sh b/scripts/cancel-all-netlify-builds.sh
@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
 
-# netlify api listSites | jq '. | map([.name, .id])'
-v2Site="86d94ae8-f655-46a4-a859-d68696173f3a"
-v2ContractsSite="dd8bc215-e054-407f-92ef-d61511720928"
-
 function cancelSiteDeploy() #sideId
 {
     local sideId=$1
@@ -16,10 +12,13 @@ function cancelSiteDeploy() #sideId
             continue;
         fi
         echo "Cancelling build for $name $branch"
-        echo netlify api cancelSiteDeploy -d '{ "deploy_id": "'$(jq -r .id <<< $build)'"}'
-        echo
+        netlify api cancelSiteDeploy -d '{ "deploy_id": "'$(jq -r .id <<< $build)'"}' > /dev/null
     done
 }
 
+# netlify api listSites | jq '. | map([.name, .id])'
+v2Site="86d94ae8-f655-46a4-a859-d68696173f3a"
+v2ContractsSite="dd8bc215-e054-407f-92ef-d61511720928"
+
 cancelSiteDeploy $v2Site
 cancelSiteDeploy $v2ContractsSite