Merge pull request #5651 from snyk/chore/cherry-pick-deployment-fixes

chore(ci): deployment pipeline ci

.circleci/config.yml

@@ -394,6 +394,7 @@ workflows:
           name: secrets-scan
           context: snyk-bot-slack
           channel: cli-alerts
+          trusted-branch: main
 
       - prepare-build:
           requires:

.snyk

@@ -10,7 +10,7 @@ ignore:
   SNYK-JS-CROSSSPAWN-8303230:
     - '*':
         reason: No direct upgrade path available
-        expires: 2025-01-01T00:12:20.523Z
+        expires: 2025-04-01T00:12:20.523Z
         created: 2024-11-08T10:22:20.531Z
   SNYK-JS-SOURCEMAPSUPPORT-6112477:
     - '*':

help/_about-this-project/snyk-code-signing-public.pgp

@@ -1,13 +1,13 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mDMEY7bmTBYJKwYBBAHaRw8BAQdAYBCJOraO3kiE/7Q2/7k6WNZG9I3KSmbm6aNp
-05rNYji0I1NueWsgTGltaXRlZCA8Y29kZS1zaWduaW5nQHNueWsuaW8+iJkEExYK
-AEEWIQSiJmX7lsqw4Jc2BMg2dsS4KJwpbgUCY7bmTAIbAwUJA8JnAAULCQgHAgIi
-AgYVCgkICwIEFgIDAQIeBwIXgAAKCRA2dsS4KJwpbnQGAQCspMHbIQxwH0juRMye
-j3zCcQK2hDCWPIs4ecx8T4Be2wEAtcD8AnZSbmXbrnPAarKeCGwfIWCKcUsmkqzz
-rB04/gm4OARjtuZMEgorBgEEAZdVAQUBAQdAOALchLEyLdhJ0U/RF+c+HFczClpE
-yqMOyzPlF9OOaAwDAQgHiH4EGBYKACYWIQSiJmX7lsqw4Jc2BMg2dsS4KJwpbgUC
-Y7bmTAIbDAUJA8JnAAAKCRA2dsS4KJwpbv9eAQDD25qh5WF7TkOZUUhe+4hLDkS3
-RdLL7tBDogAoIORt8QEA2XZvHmEfFyJgrJus+gv3GRKXHwiScYhlpmXV4T4+gws=
-=MsMZ
+mDMEZ3v1FxYJKwYBBAHaRw8BAQdAcw2KTOkyyzuOq/YLFzK/zDSyzvrp6C5HzzQ1
+iSn+TmO0I1NueWsgTGltaXRlZCA8Y29kZS1zaWduaW5nQHNueWsuaW8+iJkEExYK
+AEEWIQRGdxejCytGWEFZdWKWkdpk0AJRlAUCZ3v1FwIbAwUJA8JnAAULCQgHAgIi
+AgYVCgkICwIEFgIDAQIeBwIXgAAKCRCWkdpk0AJRlCKVAP4gZl11b9VyS60xW+3z
+GvhTaxPTnaLdbfEUzBXLi7cjNwD9GC7Qejd2efP5DhgP1QVTy9AXmG60DPmjFc7S
+dBOCeQC4OARne/UXEgorBgEEAZdVAQUBAQdAJKbPHnTcAXwS6ShVTSI4JdcRDZJX
+S1dQltqSCJoxuFEDAQgHiH4EGBYKACYWIQRGdxejCytGWEFZdWKWkdpk0AJRlAUC
+Z3v1FwIbDAUJA8JnAAAKCRCWkdpk0AJRlHxLAP9q3TGARb0Hw/aCV/YjBrYny9Pm
+XLZcKUJoddkWh9le2gD/TI+XZ820KeHR+yERl4ii1Ug5x9IePjdTtMX7q/qCdQI=
+=iyXp
 -----END PGP PUBLIC KEY BLOCK-----

release-scripts/sha256sums.txt.asc.sh

@@ -12,15 +12,15 @@ echo "${SNYK_CODE_SIGNING_PGP_PRIVATE}" \
 echo "Signing shasums file"
 gpg \
     --clear-sign \
-    --local-user=3676C4B8289C296E \
+    --default-key="${SNYK_CODE_SIGNING_PGP_KEY_ID}" \
     --passphrase="${SNYK_CODE_SIGNING_GPG_PASSPHRASE}" \
     --pinentry-mode=loopback \
     --armor \
     --batch binary-releases/sha256sums.txt
 
 gpg \
     --clear-sign \
-    --local-user=3676C4B8289C296E \
+    --default-key="${SNYK_CODE_SIGNING_PGP_KEY_ID}" \
     --passphrase="${SNYK_CODE_SIGNING_GPG_PASSPHRASE}" \
     --pinentry-mode=loopback \
     --armor \