From 7e645f54c5d0ab78592436988576a0f2765e9fab Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sat, 29 Oct 2022 21:24:26 +0200 Subject: Deprecate spack bootstrap trust/untrust (#33600) * Deprecate spack bootstrap trust/untrust * Update CI * Update tests --- .github/workflows/bootstrap-test.sh | 2 +- .github/workflows/bootstrap.yml | 16 ++++++++-------- .github/workflows/unit_tests.yaml | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to '.github') diff --git a/.github/workflows/bootstrap-test.sh b/.github/workflows/bootstrap-test.sh index fc8f93d68b..b51db3d1b7 100755 --- a/.github/workflows/bootstrap-test.sh +++ b/.github/workflows/bootstrap-test.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ex source share/spack/setup-env.sh -$PYTHON bin/spack bootstrap untrust spack-install +$PYTHON bin/spack bootstrap disable spack-install $PYTHON bin/spack -d solve zlib tree $BOOTSTRAP/store exit 0 diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 09c356a3e0..bdaefbfc3d 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -42,7 +42,7 @@ jobs: shell: runuser -u spack-test -- bash {0} run: | source share/spack/setup-env.sh - spack bootstrap untrust github-actions-v0.3 + spack bootstrap disable github-actions-v0.3 spack external find cmake bison spack -d solve zlib tree ~/.spack/bootstrap/store/ @@ -79,7 +79,7 @@ jobs: shell: runuser -u spack-test -- bash {0} run: | source share/spack/setup-env.sh - spack bootstrap untrust github-actions-v0.3 + spack bootstrap disable github-actions-v0.3 spack external find cmake bison spack -d solve zlib tree ~/.spack/bootstrap/store/ @@ -143,7 +143,7 @@ jobs: - name: Bootstrap clingo run: | source share/spack/setup-env.sh - spack bootstrap untrust github-actions-v0.3 + spack bootstrap disable github-actions-v0.3 spack external find cmake bison spack -d solve zlib tree ~/.spack/bootstrap/store/ @@ -160,7 +160,7 @@ jobs: run: | source share/spack/setup-env.sh export PATH=/usr/local/opt/bison@2.7/bin:$PATH - spack bootstrap untrust github-actions-v0.3 + spack bootstrap disable github-actions-v0.3 spack external find --not-buildable cmake bison spack -d solve zlib tree ~/.spack/bootstrap/store/ @@ -261,7 +261,7 @@ jobs: shell: runuser -u spack-test -- bash {0} run: | source share/spack/setup-env.sh - spack bootstrap untrust spack-install + spack bootstrap disable spack-install spack -d gpg list tree ~/.spack/bootstrap/store/ @@ -298,7 +298,7 @@ jobs: run: | source share/spack/setup-env.sh spack solve zlib - spack bootstrap untrust github-actions-v0.3 + spack bootstrap disable github-actions-v0.3 spack -d gpg list tree ~/.spack/bootstrap/store/ @@ -315,7 +315,7 @@ jobs: - name: Bootstrap GnuPG run: | source share/spack/setup-env.sh - spack bootstrap untrust spack-install + spack bootstrap disable spack-install spack -d gpg list tree ~/.spack/bootstrap/store/ @@ -333,7 +333,7 @@ jobs: run: | source share/spack/setup-env.sh spack solve zlib - spack bootstrap untrust github-actions-v0.3 + spack bootstrap disable github-actions-v0.3 spack -d gpg list tree ~/.spack/bootstrap/store/ diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index 36c4a4339b..dcebecaeae 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -78,7 +78,7 @@ jobs: SPACK_PYTHON: python run: | . share/spack/setup-env.sh - spack bootstrap untrust spack-install + spack bootstrap disable spack-install spack -v solve zlib - name: Run unit tests env: @@ -215,7 +215,7 @@ jobs: git --version . .github/workflows/setup_git.sh . share/spack/setup-env.sh - $(which spack) bootstrap untrust spack-install + $(which spack) bootstrap disable spack-install $(which spack) solve zlib common_args=(--dist loadfile --tx '4*popen//python=./bin/spack-tmpconfig python -u ./bin/spack python' -x) $(which spack) unit-test --cov --cov-config=pyproject.toml "${common_args[@]}" -- cgit v1.2.3-60-g2f50