Merge branch 'fer/1979' into staging

equinor · Nov 15, 2023 · 96bf4de · 96bf4de
2 parents bd7f2e9 + 443760a
commit 96bf4de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/dataset-backup.yaml b/.github/workflows/dataset-backup.yaml
@@ -10,7 +10,7 @@ on:
           - "['global-test']"
           - 'all'
         required: true
-        default: 'all'
+        default: "['global-development']"
   schedule:
     # Runs at 02:00 UTC every sunday
     - cron: '0 2 * * 0'
@@ -45,7 +45,7 @@ jobs:
     name: Backup dataset
     strategy:
       matrix:
-        dataset: ${{ (github.event.inputs.dataset != 'all'  && fromJson(github.event.inputs.dataset)) || fromJson(needs.read-satellites.outputs.matrix) }}
+        dataset: ${{ (github.event.inputs.dataset != 'all' && github.event_name == 'workflow_dispatch' && fromJson(github.event.inputs.dataset)) || fromJson(needs.read-satellites.outputs.matrix) }}
 
     steps:
       - uses: actions/checkout@v3

diff --git a/web/securityHeaders.js b/web/securityHeaders.js
@@ -26,6 +26,7 @@ const iframeSrcs = [
   'https://vds.issgovernance.com',
   'https://eac.plaii.no',
   'https://livestream.com',
+  'https://pixel.as/equinor',
   dataset === 'global-development' && 'https://equinor-gms1.wd3.myworkdayjobs-impl.com',
   dataset === 'global-development' && 'https://careers.peopleclick.eu.com',
   'https://h61q9gi9.api.sanity.io',