Merge branch 'main' into jw/log-ssl-issues

heroku · Feb 6, 2025 · f739e4a · f739e4a
2 parents 9a1e475 + 134a5b9
commit f739e4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/direwolf.yml b/.github/workflows/direwolf.yml
@@ -23,15 +23,15 @@ on:
 jobs:
   run-direwolf-tests:
     name: Run Direwolf CLI tests
-    runs-on: pub-hk-ubuntu-22.04-small
+    runs-on: pub-hk-ubuntu-24.04-ip
     timeout-minutes: 20
     environment: direwolf
     steps:
     - uses: actions/checkout@v4
     - name: Install jq
       run: |
         sudo apt-get update
-        sudo apt-get install -y awscli jq
+        sudo apt-get install -y jq
     - name: run direwolf suite
       run: ./scripts/direwolf-test-run
       env:

diff --git a/.github/workflows/release-homebrew.yml b/.github/workflows/release-homebrew.yml
@@ -12,17 +12,13 @@ on:
 jobs:
   release-homebrew:
     # pub-hk-ubuntu-22.04- due to IP allow list issues with public repos: https://salesforce.quip.com/bu6UA0KImOxJ
-    runs-on: pub-hk-ubuntu-22.04-small
+    runs-on: pub-hk-ubuntu-24.04-ip
     environment: ReleaseHomebrew
     steps:
       - uses: actions/checkout@v4
       - uses: webfactory/[email protected]
         with:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-      - name: install AWS cli
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y awscli
       - name: yarn install
         run: yarn --immutable --network-timeout 1000000
       - run: echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c 1-7)" >> $GITHUB_ENV