diff options
author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2024-10-04 10:35:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-04 10:35:07 +0200 |
commit | 905e7b9b4559691fb1fdde3340f33ef0214e60dc (patch) | |
tree | 95cf5937d06ef4c660d98c5aaaca3c6aee1256be /.github/workflows | |
parent | ad294bc19f046d8cf6d80d1b244cae416f4f5842 (diff) | |
download | spack-905e7b9b4559691fb1fdde3340f33ef0214e60dc.tar.gz spack-905e7b9b4559691fb1fdde3340f33ef0214e60dc.tar.bz2 spack-905e7b9b4559691fb1fdde3340f33ef0214e60dc.tar.xz spack-905e7b9b4559691fb1fdde3340f33ef0214e60dc.zip |
Separate bootstrapping tests for Windows from other platforms (#46750)
This allows us to keep the workflow file tidier, and avoid
using indirections to perform platform specific operations.
Signed-off-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/bootstrap.yml | 90 |
1 files changed, 47 insertions, 43 deletions
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index cc392cd6be..27194a67e9 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -53,10 +53,10 @@ jobs: runs-on: ${{ matrix.runner }} strategy: matrix: - runner: ['macos-13', 'macos-14', "ubuntu-latest", "windows-latest"] + runner: ['macos-13', 'macos-14', "ubuntu-latest"] steps: - name: Setup macOS - if: ${{ matrix.runner != 'ubuntu-latest' && matrix.runner != 'windows-latest' }} + if: ${{ matrix.runner != 'ubuntu-latest' }} run: | brew install cmake bison tree - name: Checkout @@ -67,19 +67,13 @@ jobs: with: python-version: "3.12" - name: Bootstrap clingo - env: - SETUP_SCRIPT_EXT: ${{ matrix.runner == 'windows-latest' && 'ps1' || 'sh' }} - SETUP_SCRIPT_SOURCE: ${{ matrix.runner == 'windows-latest' && './' || 'source ' }} - USER_SCOPE_PARENT_DIR: ${{ matrix.runner == 'windows-latest' && '$env:userprofile' || '$HOME' }} - VALIDATE_LAST_EXIT: ${{ matrix.runner == 'windows-latest' && './share/spack/qa/validate_last_exit.ps1' || '' }} run: | - ${{ env.SETUP_SCRIPT_SOURCE }}share/spack/setup-env.${{ env.SETUP_SCRIPT_EXT }} + source share/spack/setup-env.sh spack bootstrap disable github-actions-v0.5 spack bootstrap disable github-actions-v0.4 spack external find --not-buildable cmake bison spack -d solve zlib - ${{ env.VALIDATE_LAST_EXIT }} - tree ${{ env.USER_SCOPE_PARENT_DIR }}/.spack/bootstrap/store/ + tree $HOME/.spack/bootstrap/store/ gnupg-sources: runs-on: ${{ matrix.runner }} @@ -112,10 +106,10 @@ jobs: runs-on: ${{ matrix.runner }} strategy: matrix: - runner: ['macos-13', 'macos-14', "ubuntu-latest", "windows-latest"] + runner: ['macos-13', 'macos-14', "ubuntu-latest"] steps: - name: Setup macOS - if: ${{ matrix.runner != 'ubuntu-latest' && matrix.runner != 'windows-latest'}} + if: ${{ matrix.runner != 'ubuntu-latest' }} run: | brew install tree # Remove GnuPG since we want to bootstrap it @@ -124,11 +118,6 @@ jobs: if: ${{ matrix.runner == 'ubuntu-latest' }} run: | sudo rm -rf $(which gpg) $(which gpg2) $(which patchelf) - - name: Setup Windows - if: ${{ matrix.runner == 'windows-latest' }} - run: | - Remove-Item -Path (Get-Command gpg).Path - Remove-Item -Path (Get-Command file).Path - name: Checkout uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 with: @@ -142,20 +131,11 @@ jobs: 3.11 3.12 - name: Set bootstrap sources - env: - SETUP_SCRIPT_EXT: ${{ matrix.runner == 'windows-latest' && 'ps1' || 'sh' }} - SETUP_SCRIPT_SOURCE: ${{ matrix.runner == 'windows-latest' && './' || 'source ' }} - run: | - ${{ env.SETUP_SCRIPT_SOURCE }}share/spack/setup-env.${{ env.SETUP_SCRIPT_EXT }} - spack bootstrap disable github-actions-v0.4 - - name: Disable from source bootstrap - if: ${{ matrix.runner != 'windows-latest' }} run: | source share/spack/setup-env.sh + spack bootstrap disable github-actions-v0.4 spack bootstrap disable spack-install - name: Bootstrap clingo - # No binary clingo on Windows yet - if: ${{ matrix.runner != 'windows-latest' }} run: | set -e for ver in '3.8' '3.9' '3.10' '3.11' '3.12' ; do @@ -178,24 +158,48 @@ jobs: fi done - name: Bootstrap GnuPG - env: - SETUP_SCRIPT_EXT: ${{ matrix.runner == 'windows-latest' && 'ps1' || 'sh' }} - SETUP_SCRIPT_SOURCE: ${{ matrix.runner == 'windows-latest' && './' || 'source ' }} - USER_SCOPE_PARENT_DIR: ${{ matrix.runner == 'windows-latest' && '$env:userprofile' || '$HOME' }} - VALIDATE_LAST_EXIT: ${{ matrix.runner == 'windows-latest' && './share/spack/qa/validate_last_exit.ps1' || '' }} run: | - ${{ env.SETUP_SCRIPT_SOURCE }}share/spack/setup-env.${{ env.SETUP_SCRIPT_EXT }} + source share/spack/setup-env.sh + spack -d gpg list + tree $HOME/.spack/bootstrap/store/ + - name: Bootstrap File + run: | + source share/spack/setup-env.sh + spack -d python share/spack/qa/bootstrap-file.py + tree $HOME/.spack/bootstrap/store/ + + windows: + runs-on: "windows-latest" + steps: + - name: Checkout + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + with: + fetch-depth: 0 + - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 + with: + python-version: "3.12" + - name: Setup Windows + run: | + Remove-Item -Path (Get-Command gpg).Path + Remove-Item -Path (Get-Command file).Path + - name: Bootstrap clingo + run: | + ./share/spack/setup-env.ps1 + spack bootstrap disable github-actions-v0.5 + spack bootstrap disable github-actions-v0.4 + spack external find --not-buildable cmake bison + spack -d solve zlib + ./share/spack/qa/validate_last_exit.ps1 + tree $env:userprofile/.spack/bootstrap/store/ + - name: Bootstrap GnuPG + run: | + ./share/spack/setup-env.ps1 spack -d gpg list - ${{ env.VALIDATE_LAST_EXIT }} - tree ${{ env.USER_SCOPE_PARENT_DIR }}/.spack/bootstrap/store/ + ./share/spack/qa/validate_last_exit.ps1 + tree $env:userprofile/.spack/bootstrap/store/ - name: Bootstrap File - env: - SETUP_SCRIPT_EXT: ${{ matrix.runner == 'windows-latest' && 'ps1' || 'sh' }} - SETUP_SCRIPT_SOURCE: ${{ matrix.runner == 'windows-latest' && './' || 'source ' }} - USER_SCOPE_PARENT_DIR: ${{ matrix.runner == 'windows-latest' && '$env:userprofile' || '$HOME' }} - VALIDATE_LAST_EXIT: ${{ matrix.runner == 'windows-latest' && './share/spack/qa/validate_last_exit.ps1' || '' }} run: | - ${{ env.SETUP_SCRIPT_SOURCE }}share/spack/setup-env.${{ env.SETUP_SCRIPT_EXT }} + ./share/spack/setup-env.ps1 spack -d python share/spack/qa/bootstrap-file.py - ${{ env.VALIDATE_LAST_EXIT }} - tree ${{ env.USER_SCOPE_PARENT_DIR }}/.spack/bootstrap/store/ + ./share/spack/qa/validate_last_exit.ps1 + tree $env:userprofile/.spack/bootstrap/store/ |