Adapt to setup-homebrew changes (Homebrew#140262)

mdevreugd · Jan 27, 2023 · c474421 · c474421
1 parent 93d473b
commit c474421
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 73 deletions.
diff --git a/.github/workflows/bump-unversioned-casks.yml b/.github/workflows/bump-unversioned-casks.yml
@@ -46,13 +46,6 @@ jobs:
         with:
           signing_key: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY }}
 
-      # Workaround until the `cache` action uses the changes from
-      # https://github.com/actions/toolkit/pull/580.
-      - name: Unlink workspace
-        run: |
-          mv "${GITHUB_WORKSPACE}" "${GITHUB_WORKSPACE}-link"
-          mkdir "${GITHUB_WORKSPACE}"
-
       - name: Cache Homebrew Gems
         uses: actions/cache@v3
         with:
@@ -80,13 +73,6 @@ jobs:
         run: |
           rm -f ~/bump-unversioned-casks-state.json
 
-      # Workaround until the `cache` action uses the changes from
-      # https://github.com/actions/toolkit/pull/580.
-      - name: Re-link workspace
-        run: |
-          rmdir "${GITHUB_WORKSPACE}"
-          mv "${GITHUB_WORKSPACE}-link" "${GITHUB_WORKSPACE}"
-
       - name: Run brew bump-unversioned-casks ${{ github.repository }}
         run: |
           brew bump-unversioned-casks --state-file ~/bump-unversioned-casks-state.json --limit 15 '${{ github.repository }}'
@@ -95,10 +81,3 @@ jobs:
           HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_GITHUB_PUBLIC_REPO_TOKEN }}
           HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
         timeout-minutes: 20
-
-      # Workaround until the `cache` action uses the changes from
-      # https://github.com/actions/toolkit/pull/580.
-      - name: Unlink workspace
-        run: |
-          rm "${GITHUB_WORKSPACE}"
-          mkdir "${GITHUB_WORKSPACE}"
diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
@@ -30,13 +30,6 @@ jobs:
         with:
           test-bot: false
 
-      # Workaround until the `cache` action uses the changes from
-      # https://github.com/actions/toolkit/pull/580.
-      - name: Unlink workspace
-        run: |
-          rm "${GITHUB_WORKSPACE}"
-          mkdir "${GITHUB_WORKSPACE}"
-
       - name: Cache Homebrew Gems
         id: cache
         uses: actions/cache@v3

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -92,27 +92,13 @@ jobs:
           brew unlink python && brew link --overwrite python
         if: runner.os == 'macOS'
 
-      # Workaround until the `cache` action uses the changes from
-      # https://github.com/actions/toolkit/pull/580.
-      - name: Unlink workspace
-        run: |
-          mv "${GITHUB_WORKSPACE}" "${GITHUB_WORKSPACE}-link"
-          mkdir "${GITHUB_WORKSPACE}"
-
       - name: Cache Homebrew Gems
         uses: actions/cache@v3
         with:
           path: ${{ steps.set-up-homebrew.outputs.gems-path }}
           key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
           restore-keys: ${{ runner.os }}-rubygems-
 
-      # Workaround until the `cache` action uses the changes from
-      # https://github.com/actions/toolkit/pull/580.
-      - name: Re-link workspace
-        run: |
-          rmdir "${GITHUB_WORKSPACE}"
-          mv "${GITHUB_WORKSPACE}-link" "${GITHUB_WORKSPACE}"
-
       - name: Install Homebrew Gems
         id: gems
         run: brew install-bundler-gems
@@ -260,12 +246,6 @@ jobs:
           EOF
         if: always() && steps.snapshot.outcome == 'success'
 
-      # Workaround until the `cache` action uses the changes from
-      # https://github.com/actions/toolkit/pull/580.
-      - name: Unlink workspace
-        run: |
-          rm "${GITHUB_WORKSPACE}"
-          mkdir "${GITHUB_WORKSPACE}"
   conclusion:
     name: conclusion
     needs: test

diff --git a/.github/workflows/publish-commit-casks.yml b/.github/workflows/publish-commit-casks.yml
@@ -37,14 +37,6 @@ jobs:
         with:
           test-bot: false
 
-      # Workaround until the `cache` action uses the changes from
-      # https://github.com/actions/toolkit/pull/580.
-      - name: Unlink workspace
-        if: github.event.inputs.self_hosted != 'true'
-        run: |
-          mv "${GITHUB_WORKSPACE}" "${GITHUB_WORKSPACE}-link"
-          mkdir "${GITHUB_WORKSPACE}"
-
       - name: Cache gems
         if: github.event.inputs.self_hosted != 'true'
         uses: actions/cache@v3
@@ -53,14 +45,6 @@ jobs:
           key: ${{runner.os}}-rubygems-v2-${{steps.set-up-homebrew.outputs.gems-hash}}
           restore-keys: ${{runner.os}}-rubygems-v2-
 
-      # Workaround until the `cache` action uses the changes from
-      # https://github.com/actions/toolkit/pull/580.
-      - name: Re-link workspace
-        if: github.event.inputs.self_hosted != 'true'
-        run: |
-          rmdir "${GITHUB_WORKSPACE}"
-          mv "${GITHUB_WORKSPACE}-link" "${GITHUB_WORKSPACE}"
-
       - name: Install gems
         if: github.event.inputs.self_hosted != 'true'
         run: brew install-bundler-gems
@@ -107,11 +91,3 @@ jobs:
           token: ${{secrets.HOMEBREW_GITHUB_PUBLIC_REPO_TOKEN}}
           pr: ${{github.event.inputs.pull_request}}
           message: "merge failed"
-
-      # Workaround until the `cache` action uses the changes from
-      # https://github.com/actions/toolkit/pull/580.
-      - name: Unlink workspace
-        if: github.event.inputs.self_hosted != 'true'
-        run: |
-          rm "${GITHUB_WORKSPACE}"
-          mkdir "${GITHUB_WORKSPACE}"
diff --git a/cmd/lib/generate-matrix.rb b/cmd/lib/generate-matrix.rb
@@ -14,7 +14,7 @@
   []
 end
 
-tap = Tap.from_path(Dir.pwd)
+tap = Tap.fetch(ENV.fetch("GITHUB_REPOSITORY"))
 
 runner = CiMatrix.random_runner[:name]
 syntax_job = {