fix: add missing circle ci apt packages (heroku#1970)

tutanck · Mar 31, 2022 · 534e652 · 534e652
1 parent 0bb3f4a
commit 534e652
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -99,7 +99,7 @@ jobs:
             - node-modules-v1-win-{{ checksum "yarn.lock" }}
       - run:
           name: Install dependencies
-          command: yarn install --frozen-lockfile
+          command: yarn install --frozen-lockfile --prefer-offline
       - save_cache:
           paths:
             - ./node_modules
@@ -142,8 +142,11 @@ jobs:
     steps:
       - checkout
       - run: *yarn_setup
-      - run: *yarn_install
       - restore_cache: *yarn_restore_cache
+      - run: *yarn_install
+      - run: |
+          apt-get update
+          apt-get install -y nsis p7zip-full
       - run: |
           mkdir -p /build
           cp yarn.lock packages/cli
@@ -163,6 +166,9 @@ jobs:
       - run: *yarn_setup
       - restore_cache: *yarn_restore_cache
       - run: *yarn_install
+      - run: |
+          apt-get update
+          apt-get install -y p7zip-full
       - run: |
           mkdir -p /build
           cp yarn.lock packages/cli
@@ -182,6 +188,9 @@ jobs:
       - run: *yarn_setup
       - restore_cache: *yarn_restore_cache
       - run: *yarn_install
+      - run: |
+          apt-get update
+          apt-get install -y apt-utils
       - run: |
           mkdir -p /build
           cp yarn.lock packages/cli
@@ -233,6 +242,9 @@ jobs:
       - run: *yarn_install
       - attach_workspace:
           at: /cli/packages/cli
+      - run: |
+          apt-get update
+          apt-get install -y awscli
       - run:
           name: packages/cli yarn install
           command: |
@@ -248,13 +260,14 @@ jobs:
       - run:
           name: Publish Install Scripts
           command: /cli/scripts/postrelease/install_scripts
-  trigger_macos:
-    <<: *defaults
-    steps:
-      - add_ssh_keys
-      - checkout
-      - run: yarn --frozen-lockfile
-      - run: ./scripts/release/macos_installer_trigger
+  ## Job not currently being used
+  # trigger_macos:
+  #   <<: *defaults
+  #   steps:
+  #     - add_ssh_keys
+  #     - checkout
+  #     - run: yarn --frozen-lockfile
+  #     - run: ./scripts/release/macos_installer_trigger
   release-homebrew:
     <<: *defaults
     steps:
@@ -272,7 +285,9 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - run: yarn --frozen-lockfile
+      - run: |
+          apt-get update
+          apt-get install -y awscli
       - run: ./scripts/postrelease/invalidate_cdn_cache
   change-management:
     <<: *defaults
@@ -370,10 +385,8 @@ workflows:
             tags: *version_tags
             branches: &never_run_on_branches
               ignore: /.*/
-          context:
-            - heroku-cli-s3
           requires:
-            - invalidate-cdn-cache
+            - release-deb-and-tarballs
       - change-management: &change_management
           filters: *tags_only
           context:

diff --git a/scripts/sign/deb b/scripts/sign/deb
@@ -4,8 +4,8 @@ set -e -o pipefail
 # This will sign files after `oclif-dev pack:deb`, this script should be ran from
 # the `dist/deb` folder
 echo "$HEROKU_DEB_SECRET_KEY" | base64 -d 2> /dev/null | gpg --import --batch --passphrase "$HEROKU_DEB_SIGNING_PASSWORD" 2> /dev/null
-gpg --digest-algo SHA512 --clearsign --batch --passphrase "$HEROKU_DEB_SIGNING_PASSWORD" -u $HEROKU_DEB_KEY_ID -o InRelease Release 2> /dev/null
-gpg --digest-algo SHA512 -abs --batch --passphrase "$HEROKU_DEB_SIGNING_PASSWORD" -u $HEROKU_DEB_KEY_ID -o Release.gpg Release 2> /dev/null
+gpg --digest-algo SHA512 --clearsign --pinentry-mode loopback --passphrase "$HEROKU_DEB_SIGNING_PASSWORD" -u $HEROKU_DEB_KEY_ID -o InRelease Release 2> /dev/null
+gpg --digest-algo SHA512 -abs --pinentry-mode loopback --passphrase "$HEROKU_DEB_SIGNING_PASSWORD" -u $HEROKU_DEB_KEY_ID -o Release.gpg Release 2> /dev/null
 echo "Signed debian packages successfully"
 echo "sha256 sums:"
 sha256sum *Release*