summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorTodd Gamblin <gamblin2@llnl.gov>2022-05-10 07:27:37 -0700
committerGitHub <noreply@github.com>2022-05-10 16:27:37 +0200
commit555202833f587ca604b7b091e11d36e237767d79 (patch)
tree57bdf596a843807ac8c1fc6ee261886b2b55afb4 /.github
parentb76fc61debcc09bad12e353b317a8ce9ee7501cd (diff)
downloadspack-555202833f587ca604b7b091e11d36e237767d79.tar.gz
spack-555202833f587ca604b7b091e11d36e237767d79.tar.bz2
spack-555202833f587ca604b7b091e11d36e237767d79.tar.xz
spack-555202833f587ca604b7b091e11d36e237767d79.zip
bootstrap: clean up CI workflows a bit (#30574)
- [x] Add `mkdir -p` and `chmod` to ensure `/home/spack-test` exists and has correct permissions. - [x] Remove version comments from dependabot-managed action commits - [x] Don't duplicate comment describing required fixes for distros with patched git
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/bootstrap.yml127
1 files changed, 66 insertions, 61 deletions
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index b0885e1ab3..ec2987545e 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -31,20 +31,20 @@ jobs:
bzip2 curl file gcc-c++ gcc gcc-gfortran git gnupg2 gzip \
make patch unzip which xz python3 python3-devel tree \
cmake bison bison-devel libstdc++-static
- - name: Work around CVE-2022-24765
+ - name: Checkout
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+ - name: Setup non-root user
run: |
- # See:
- # - https://github.blog/2022-04-12-git-security-vulnerability-announced/
- # - https://github.com/actions/checkout/issues/760
+ # See [1] below
git config --global --add safe.directory /__w/spack/spack
- - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2
- - name: Setup repo and non-root user
+ useradd spack-test && mkdir -p ~spack-test
+ chown -R spack-test . ~spack-test
+ - name: Setup repo
+ shell: runuser -u spack-test -- bash {0}
run: |
git --version
git fetch --unshallow
. .github/workflows/setup_git.sh
- useradd spack-test
- chown -R spack-test .
- name: Bootstrap clingo
shell: runuser -u spack-test -- bash {0}
run: |
@@ -67,22 +67,20 @@ jobs:
bzip2 curl file g++ gcc gfortran git gnupg2 gzip \
make patch unzip xz-utils python3 python3-dev tree \
cmake bison
- - name: Work around CVE-2022-24765
+ - name: Checkout
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+ - name: Setup non-root user
run: |
- # Apparently Ubuntu patched git v2.25.1 with a security patch that introduces
- # a breaking behavior. See:
- # - https://github.blog/2022-04-12-git-security-vulnerability-announced/
- # - https://github.com/actions/checkout/issues/760
- # - http://changelogs.ubuntu.com/changelogs/pool/main/g/git/git_2.25.1-1ubuntu3.3/changelog
+ # See [1] below
git config --global --add safe.directory /__w/spack/spack
- - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2
- - name: Setup repo and non-root user
+ useradd spack-test && mkdir -p ~spack-test
+ chown -R spack-test . ~spack-test
+ - name: Setup repo
+ shell: runuser -u spack-test -- bash {0}
run: |
git --version
git fetch --unshallow
. .github/workflows/setup_git.sh
- useradd -m spack-test
- chown -R spack-test .
- name: Bootstrap clingo
shell: runuser -u spack-test -- bash {0}
run: |
@@ -104,22 +102,20 @@ jobs:
apt-get install -y \
bzip2 curl file g++ gcc gfortran git gnupg2 gzip \
make patch unzip xz-utils python3 python3-dev tree
- - name: Work around CVE-2022-24765
+ - name: Checkout
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+ - name: Setup non-root user
run: |
- # Apparently Ubuntu patched git v2.25.1 with a security patch that introduces
- # a breaking behavior. See:
- # - https://github.blog/2022-04-12-git-security-vulnerability-announced/
- # - https://github.com/actions/checkout/issues/760
- # - http://changelogs.ubuntu.com/changelogs/pool/main/g/git/git_2.25.1-1ubuntu3.3/changelog
+ # See [1] below
git config --global --add safe.directory /__w/spack/spack
- - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2
- - name: Setup repo and non-root user
+ useradd spack-test && mkdir -p ~spack-test
+ chown -R spack-test . ~spack-test
+ - name: Setup repo
+ shell: runuser -u spack-test -- bash {0}
run: |
git --version
git fetch --unshallow
. .github/workflows/setup_git.sh
- useradd -m spack-test
- chown -R spack-test .
- name: Bootstrap clingo
shell: runuser -u spack-test -- bash {0}
run: |
@@ -127,7 +123,6 @@ jobs:
spack -d solve zlib
tree ~/.spack/bootstrap/store/
-
opensuse-clingo-sources:
runs-on: ubuntu-latest
container: "opensuse/leap:latest"
@@ -140,12 +135,13 @@ jobs:
bzip2 curl file gcc-c++ gcc gcc-fortran tar git gpg2 gzip \
make patch unzip which xz python3 python3-devel tree \
cmake bison
- - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2
- - name: Setup repo and non-root user
+ - name: Checkout
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+ - name: Setup repo
run: |
- git --version
- # See http://changelogs.ubuntu.com/changelogs/pool/main/g/git/git_2.25.1-1ubuntu3.3/changelog
+ # See [1] below
git config --global --add safe.directory /__w/spack/spack
+ git --version
git fetch --unshallow
. .github/workflows/setup_git.sh
- name: Bootstrap clingo
@@ -162,7 +158,8 @@ jobs:
- name: Install dependencies
run: |
brew install cmake bison@2.7 tree
- - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2
+ - name: Checkout
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Bootstrap clingo
run: |
source share/spack/setup-env.sh
@@ -181,8 +178,9 @@ jobs:
- name: Install dependencies
run: |
brew install tree
- - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2
- - uses: actions/setup-python@98f2ad02fd48d057ee3b4d4f66525b231c3e52b6 # @v2
+ - name: Checkout
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+ - uses: actions/setup-python@98f2ad02fd48d057ee3b4d4f66525b231c3e52b6
with:
python-version: ${{ matrix.python-version }}
- name: Bootstrap clingo
@@ -198,11 +196,12 @@ jobs:
matrix:
python-version: ['2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10']
steps:
- - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2
- - uses: actions/setup-python@98f2ad02fd48d057ee3b4d4f66525b231c3e52b6 # @v2
+ - name: Checkout
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+ - uses: actions/setup-python@98f2ad02fd48d057ee3b4d4f66525b231c3e52b6
with:
python-version: ${{ matrix.python-version }}
- - name: Setup repo and non-root user
+ - name: Setup repo
run: |
git --version
git fetch --unshallow
@@ -226,22 +225,20 @@ jobs:
apt-get install -y \
bzip2 curl file g++ gcc patchelf gfortran git gzip \
make patch unzip xz-utils python3 python3-dev tree
- - name: Work around CVE-2022-24765
+ - name: Checkout
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+ - name: Setup non-root user
run: |
- # Apparently Ubuntu patched git v2.25.1 with a security patch that introduces
- # a breaking behavior. See:
- # - https://github.blog/2022-04-12-git-security-vulnerability-announced/
- # - https://github.com/actions/checkout/issues/760
- # - http://changelogs.ubuntu.com/changelogs/pool/main/g/git/git_2.25.1-1ubuntu3.3/changelog
+ # See [1] below
git config --global --add safe.directory /__w/spack/spack
- - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- - name: Setup repo and non-root user
+ useradd spack-test && mkdir -p ~spack-test
+ chown -R spack-test . ~spack-test
+ - name: Setup repo
+ shell: runuser -u spack-test -- bash {0}
run: |
git --version
git fetch --unshallow
. .github/workflows/setup_git.sh
- useradd -m spack-test
- chown -R spack-test .
- name: Bootstrap GnuPG
shell: runuser -u spack-test -- bash {0}
run: |
@@ -263,22 +260,20 @@ jobs:
bzip2 curl file g++ gcc patchelf gfortran git gzip \
make patch unzip xz-utils python3 python3-dev tree \
gawk
- - name: Work around CVE-2022-24765
+ - name: Checkout
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+ - name: Setup non-root user
run: |
- # Apparently Ubuntu patched git v2.25.1 with a security patch that introduces
- # a breaking behavior. See:
- # - https://github.blog/2022-04-12-git-security-vulnerability-announced/
- # - https://github.com/actions/checkout/issues/760
- # - http://changelogs.ubuntu.com/changelogs/pool/main/g/git/git_2.25.1-1ubuntu3.3/changelog
+ # See [1] below
git config --global --add safe.directory /__w/spack/spack
- - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- - name: Setup repo and non-root user
+ useradd spack-test && mkdir -p ~spack-test
+ chown -R spack-test . ~spack-test
+ - name: Setup repo
+ shell: runuser -u spack-test -- bash {0}
run: |
git --version
git fetch --unshallow
. .github/workflows/setup_git.sh
- useradd -m spack-test
- chown -R spack-test .
- name: Bootstrap GnuPG
shell: runuser -u spack-test -- bash {0}
run: |
@@ -296,7 +291,8 @@ jobs:
brew install tree
# Remove GnuPG since we want to bootstrap it
sudo rm -rf /usr/local/bin/gpg
- - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+ - name: Checkout
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Bootstrap GnuPG
run: |
source share/spack/setup-env.sh
@@ -312,7 +308,8 @@ jobs:
brew install gawk tree
# Remove GnuPG since we want to bootstrap it
sudo rm -rf /usr/local/bin/gpg
- - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+ - name: Checkout
+ uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Bootstrap GnuPG
run: |
source share/spack/setup-env.sh
@@ -320,3 +317,11 @@ jobs:
spack bootstrap untrust github-actions-v0.2
spack -d gpg list
tree ~/.spack/bootstrap/store/
+
+
+# [1] Distros that have patched git to resolve CVE-2022-24765 (e.g. Ubuntu patching v2.25.1)
+# introduce breaking behaviorso we have to set `safe.directory` in gitconfig ourselves.
+# See:
+# - https://github.blog/2022-04-12-git-security-vulnerability-announced/
+# - https://github.com/actions/checkout/issues/760
+# - http://changelogs.ubuntu.com/changelogs/pool/main/g/git/git_2.25.1-1ubuntu3.3/changelog