diff options
| author | Harmen Stoppels <me@harmenstoppels.nl> | 2024-10-24 08:56:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-24 08:56:42 +0200 |
| commit | 61cbfc1da060c078e7219fbd61ff674eb36969ae (patch) | |
| tree | 15e54ece8b215cd8dca8b8f8e3fbfea04aef5f6e | |
| parent | d8c80747624e32ade173de081473782e3fb7eebe (diff) | |
| download | spack-61cbfc1da060c078e7219fbd61ff674eb36969ae.tar.gz spack-61cbfc1da060c078e7219fbd61ff674eb36969ae.tar.bz2 spack-61cbfc1da060c078e7219fbd61ff674eb36969ae.tar.xz spack-61cbfc1da060c078e7219fbd61ff674eb36969ae.zip | |
bootstrap: remove all system gnupg/patchelf executables (#47165)
| -rw-r--r-- | .github/workflows/bootstrap.yml | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index da7bf49fad..13dbd2d998 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -83,12 +83,12 @@ jobs: steps: - name: Setup macOS if: ${{ matrix.runner != 'ubuntu-latest' }} + run: brew install tree gawk + - name: Remove system executables run: | - brew install tree gawk - sudo rm -rf $(command -v gpg gpg2) - - name: Setup Ubuntu - if: ${{ matrix.runner == 'ubuntu-latest' }} - run: sudo rm -rf $(command -v gpg gpg2 patchelf) + while [ -n "$(command -v gpg gpg2 patchelf)" ]; do + sudo rm $(command -v gpg gpg2 patchelf) + done - name: Checkout uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 with: @@ -110,14 +110,12 @@ jobs: steps: - name: Setup macOS if: ${{ matrix.runner != 'ubuntu-latest' }} + run: brew install tree + - name: Remove system executables run: | - brew install tree - # Remove GnuPG since we want to bootstrap it - sudo rm -rf /usr/local/bin/gpg - - name: Setup Ubuntu - if: ${{ matrix.runner == 'ubuntu-latest' }} - run: | - sudo rm -rf $(which gpg) $(which gpg2) $(which patchelf) + while [ -n "$(command -v gpg gpg2 patchelf)" ]; do + sudo rm $(command -v gpg gpg2 patchelf) + done - name: Checkout uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 with: |