From bc560b6fbdb405a056ae642cf66287e80302b6da Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sun, 16 Jun 2024 23:24:25 -0500 Subject: [PATCH 1/6] [ci] simplify CI setup --- .ci/setup.sh | 14 ++------------ .github/workflows/triggering_comments.yml | 6 +++++- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.ci/setup.sh b/.ci/setup.sh index 7fe54db9c2f..978c4354bc2 100755 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -20,9 +20,7 @@ if [[ $OS_NAME == "macos" ]]; then # Check https://github.com/actions/runner-images/tree/main/images/macos for available # versions of Xcode sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer || exit 1 - if [[ $TASK != "mpi" ]]; then - brew install gcc - fi + brew install gcc fi if [[ $TASK == "mpi" ]]; then brew install open-mpi @@ -41,23 +39,15 @@ else # Linux software-properties-common sudo apt-get install --no-install-recommends -y \ - apt-utils \ build-essential \ ca-certificates \ cmake \ curl \ git \ - iputils-ping \ - jq \ libcurl4 \ libicu-dev \ libssl-dev \ - libunwind8 \ - locales \ - locales-all \ - netcat \ - unzip \ - zip || exit 1 + locales-all || exit 1 if [[ $COMPILER == "clang" ]]; then sudo apt-get install --no-install-recommends -y \ clang \ diff --git a/.github/workflows/triggering_comments.yml b/.github/workflows/triggering_comments.yml index 220a0287772..262f4b99ff3 100644 --- a/.github/workflows/triggering_comments.yml +++ b/.github/workflows/triggering_comments.yml @@ -16,7 +16,11 @@ jobs: with: fetch-depth: 5 submodules: false - + - name: Install software + run: | + apt-get update + apt-get install -y --no-install-recommends \ + jq - name: Trigger R valgrind tests if: github.event.comment.body == '/gha run r-valgrind' run: | From db042239ca3073d7fd1a8bcc62a4c8ef49d5bcfe Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sun, 16 Jun 2024 23:28:09 -0500 Subject: [PATCH 2/6] ok locales is necessary --- .ci/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/setup.sh b/.ci/setup.sh index 978c4354bc2..cec87e15202 100755 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -47,6 +47,7 @@ else # Linux libcurl4 \ libicu-dev \ libssl-dev \ + locales \ locales-all || exit 1 if [[ $COMPILER == "clang" ]]; then sudo apt-get install --no-install-recommends -y \ From 95b446ff945a57b28138a08004ab9b6eea7015ba Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sun, 16 Jun 2024 23:46:40 -0500 Subject: [PATCH 3/6] add a few more --no-install-recommends --- .ci/setup.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.ci/setup.sh b/.ci/setup.sh index cec87e15202..ecdc4235409 100755 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -54,13 +54,15 @@ else # Linux clang \ libomp-dev elif [[ $COMPILER == "clang-17" ]]; then - sudo apt-get install wget + sudo apt-get install --no-install-recommends -y \ + wget wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc sudo apt-add-repository deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main sudo apt-add-repository deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main sudo apt-get update - sudo apt-get install -y clang-17 - sudo apt-get install --no-install-recommends -y libomp-17-dev + sudo apt-get install --no-install-recommends -y \ + clang-17 \ + libomp-17-dev fi export LANG="en_US.UTF-8" From 9d7a250f0c819dc7d8119cc247df494a7be2a81c Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 17 Jun 2024 10:43:10 -0500 Subject: [PATCH 4/6] the clang-17 suggested packages might be necessary --- .ci/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/setup.sh b/.ci/setup.sh index 8d68563f350..fe918d68a78 100755 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -60,7 +60,7 @@ else # Linux sudo apt-add-repository deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main sudo apt-add-repository deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main sudo apt-get update - sudo apt-get install --no-install-recommends -y \ + sudo apt-get install -y \ clang-17 \ libomp-17-dev fi From ce70add9bde67e4ff5517f041e13b18b6b54e6b6 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 17 Jun 2024 12:07:26 -0500 Subject: [PATCH 5/6] triggering_comments is getting 'jq' pre-installed by GitHub Actions --- .github/workflows/triggering_comments.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/triggering_comments.yml b/.github/workflows/triggering_comments.yml index 262f4b99ff3..ee4c1b902c8 100644 --- a/.github/workflows/triggering_comments.yml +++ b/.github/workflows/triggering_comments.yml @@ -16,11 +16,6 @@ jobs: with: fetch-depth: 5 submodules: false - - name: Install software - run: | - apt-get update - apt-get install -y --no-install-recommends \ - jq - name: Trigger R valgrind tests if: github.event.comment.body == '/gha run r-valgrind' run: | From 2f0f6f409abcc351fa7ef49f8ad2f05204664892 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 17 Jun 2024 12:07:51 -0500 Subject: [PATCH 6/6] revert whitespace --- .github/workflows/triggering_comments.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/triggering_comments.yml b/.github/workflows/triggering_comments.yml index ee4c1b902c8..220a0287772 100644 --- a/.github/workflows/triggering_comments.yml +++ b/.github/workflows/triggering_comments.yml @@ -16,6 +16,7 @@ jobs: with: fetch-depth: 5 submodules: false + - name: Trigger R valgrind tests if: github.event.comment.body == '/gha run r-valgrind' run: |