From 2f1dc16cb3fa983291ccba87691c0e3b003a58d6 Mon Sep 17 00:00:00 2001 From: Joe Latessa Date: Mon, 14 Sep 2026 14:41:55 -0400 Subject: [PATCH 1/7] update where pythia is downloaded from for MacOS workflow --- .../workflows/test-build-macos-native.yaml | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-build-macos-native.yaml b/.github/workflows/test-build-macos-native.yaml index a57ef1d0..edd80f73 100644 --- a/.github/workflows/test-build-macos-native.yaml +++ b/.github/workflows/test-build-macos-native.yaml @@ -119,17 +119,22 @@ jobs: - name: Download Pythia 8315 run: | - cd ${GITHUB_WORKSPACE} - curl -SLOk http://pythia.org/download/pythia83/pythia8315.tgz - ls -l + cd "${GITHUB_WORKSPACE}" + git clone \ + --branch pythia8315 \ + --single-branch \ + --depth 1 \ + https://gitlab.com/Pythia8/releases.git \ + pythia8315 - name: Build and Install Pythia 8315 run: | - tar -xzf pythia8315.tgz - ls -l - cd pythia8315 - ./configure --enable-shared --prefix=${GITHUB_WORKSPACE}/pythia8315 --with-hepmc3=${GITHUB_WORKSPACE}/hepmc3-install - make + cd "${GITHUB_WORKSPACE}/pythia8315" + ./configure \ + --enable-shared \ + --prefix="${GITHUB_WORKSPACE}/pythia8315-install" \ + --with-hepmc3="${GITHUB_WORKSPACE}/hepmc3-install" + make -j2 make install - name: set more variables From c2ee577538b90c63dd3923f61dd3e278e45d490e Mon Sep 17 00:00:00 2001 From: Joe Latessa Date: Mon, 14 Sep 2026 15:31:54 -0400 Subject: [PATCH 2/7] update actions checkout version to v7 --- .github/workflows/smash_test_completes.yaml | 2 +- .github/workflows/test-build-external.yaml | 2 +- .github/workflows/test-build-macos-native.yaml | 4 ++-- .github/workflows/test-build-nPDF.yaml | 2 +- .github/workflows/test-code-format.yaml | 2 +- .github/workflows/test-events-PbPb.yaml | 4 ++-- .github/workflows/test-events-Pythia-Isr-Dat.yaml | 4 ++-- .github/workflows/test-events-Pythia-Isr-Hadron.yaml | 4 ++-- .github/workflows/test-events-Pythia-Isr-Parton.yaml | 4 ++-- .github/workflows/test-events-brick.yaml | 4 ++-- .github/workflows/test-events-pp.yaml | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/smash_test_completes.yaml b/.github/workflows/smash_test_completes.yaml index 144e0d5f..1998415d 100644 --- a/.github/workflows/smash_test_completes.yaml +++ b/.github/workflows/smash_test_completes.yaml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: path: ${{ github.event.repository.name }} diff --git a/.github/workflows/test-build-external.yaml b/.github/workflows/test-build-external.yaml index 32dd345e..4618836f 100644 --- a/.github/workflows/test-build-external.yaml +++ b/.github/workflows/test-build-external.yaml @@ -34,7 +34,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: path: ${{ github.event.repository.name }} diff --git a/.github/workflows/test-build-macos-native.yaml b/.github/workflows/test-build-macos-native.yaml index edd80f73..4781e3ee 100644 --- a/.github/workflows/test-build-macos-native.yaml +++ b/.github/workflows/test-build-macos-native.yaml @@ -143,7 +143,7 @@ jobs: echo "PYTHIA8DIR=${GITHUB_WORKSPACE}/pythia8315" >> $GITHUB_ENV - name: Checkout JETSCAPE Repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: path: ${{ github.event.repository.name }} @@ -204,7 +204,7 @@ jobs: make -j2 - name: Checkout Default-tunes - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: repository: JETSCAPE/Default-tunes ref: main diff --git a/.github/workflows/test-build-nPDF.yaml b/.github/workflows/test-build-nPDF.yaml index 9a3cb055..b0f6a180 100644 --- a/.github/workflows/test-build-nPDF.yaml +++ b/.github/workflows/test-build-nPDF.yaml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: path: ${{ github.event.repository.name }} diff --git a/.github/workflows/test-code-format.yaml b/.github/workflows/test-code-format.yaml index 568755bf..23edd4bc 100644 --- a/.github/workflows/test-code-format.yaml +++ b/.github/workflows/test-code-format.yaml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: path: ${{ github.event.repository.name }} diff --git a/.github/workflows/test-events-PbPb.yaml b/.github/workflows/test-events-PbPb.yaml index 5a0aa58e..49afee07 100644 --- a/.github/workflows/test-events-PbPb.yaml +++ b/.github/workflows/test-events-PbPb.yaml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: path: ${{ github.event.repository.name }} @@ -39,7 +39,7 @@ jobs: make -j2 - name: Checkout TEST-EXAMPLES - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: repository: JETSCAPE/TEST-EXAMPLES ref: jetscape-4.0.2 diff --git a/.github/workflows/test-events-Pythia-Isr-Dat.yaml b/.github/workflows/test-events-Pythia-Isr-Dat.yaml index 142d25e9..34034218 100644 --- a/.github/workflows/test-events-Pythia-Isr-Dat.yaml +++ b/.github/workflows/test-events-Pythia-Isr-Dat.yaml @@ -28,7 +28,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: path: ${{ github.event.repository.name }} @@ -48,7 +48,7 @@ jobs: make -j2 - name: Checkout TEST-EXAMPLES - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: repository: JETSCAPE/TEST-EXAMPLES ref: main diff --git a/.github/workflows/test-events-Pythia-Isr-Hadron.yaml b/.github/workflows/test-events-Pythia-Isr-Hadron.yaml index 8fe412dc..274d49ac 100644 --- a/.github/workflows/test-events-Pythia-Isr-Hadron.yaml +++ b/.github/workflows/test-events-Pythia-Isr-Hadron.yaml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: path: ${{ github.event.repository.name }} @@ -46,7 +46,7 @@ jobs: make -j2 - name: Checkout TEST-EXAMPLES - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: repository: JETSCAPE/TEST-EXAMPLES ref: main diff --git a/.github/workflows/test-events-Pythia-Isr-Parton.yaml b/.github/workflows/test-events-Pythia-Isr-Parton.yaml index 0d491898..9b06d652 100644 --- a/.github/workflows/test-events-Pythia-Isr-Parton.yaml +++ b/.github/workflows/test-events-Pythia-Isr-Parton.yaml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: path: ${{ github.event.repository.name }} @@ -46,7 +46,7 @@ jobs: make -j2 - name: Checkout TEST-EXAMPLES - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: repository: JETSCAPE/TEST-EXAMPLES ref: main diff --git a/.github/workflows/test-events-brick.yaml b/.github/workflows/test-events-brick.yaml index 0b395905..a43a0618 100644 --- a/.github/workflows/test-events-brick.yaml +++ b/.github/workflows/test-events-brick.yaml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: path: ${{ github.event.repository.name }} @@ -44,7 +44,7 @@ jobs: make -j2 - name: Checkout TEST-EXAMPLES - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: repository: JETSCAPE/TEST-EXAMPLES ref: jetscape-4.0.2 diff --git a/.github/workflows/test-events-pp.yaml b/.github/workflows/test-events-pp.yaml index c3aaf5f5..2a0bc164 100644 --- a/.github/workflows/test-events-pp.yaml +++ b/.github/workflows/test-events-pp.yaml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v with: path: ${{ github.event.repository.name }} @@ -39,7 +39,7 @@ jobs: make -j2 - name: Checkout TEST-EXAMPLES - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: repository: JETSCAPE/TEST-EXAMPLES ref: jetscape-4.0.2 From 40a201ab3fca1a7d2ce3120d1e77f70980c0756b Mon Sep 17 00:00:00 2001 From: Joe Latessa Date: Mon, 14 Sep 2026 15:50:55 -0400 Subject: [PATCH 3/7] investigate boost linker failure on native MacOS test --- .github/workflows/test-build-macos-native.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-build-macos-native.yaml b/.github/workflows/test-build-macos-native.yaml index 4781e3ee..dbb0407f 100644 --- a/.github/workflows/test-build-macos-native.yaml +++ b/.github/workflows/test-build-macos-native.yaml @@ -199,9 +199,11 @@ jobs: -DOpenMP_CXX_LIB_NAMES=omp \ -DOpenMP_omp_LIBRARY="$OPENMP_PREFIX/lib/libomp.dylib" \ -DOpenMP_libomp_LIBRARY="$OPENMP_PREFIX/lib/libomp.dylib" \ + -DBOOST_ROOT="$BOOST_ROOT" + -DBOOST_LIBRARYDIR="$BOOST_ROOT/lib" -DCMAKE_PREFIX_PATH="$BOOST_ROOT;$EIGEN3_CMAKE_DIR" \ -DBoost_NO_BOOST_CMAKE=ON - make -j2 + make VERBOSE=1 -j2 - name: Checkout Default-tunes uses: actions/checkout@v7 From 3b5b30d35e9c98b534aaa0ccd8d1024dcee4b5c6 Mon Sep 17 00:00:00 2001 From: Joe Latessa Date: Mon, 14 Sep 2026 15:53:27 -0400 Subject: [PATCH 4/7] fix typo, missing version number in pp test --- .github/workflows/test-events-pp.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-events-pp.yaml b/.github/workflows/test-events-pp.yaml index 2a0bc164..1bfcc27e 100644 --- a/.github/workflows/test-events-pp.yaml +++ b/.github/workflows/test-events-pp.yaml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v + uses: actions/checkout@v7 with: path: ${{ github.event.repository.name }} From 7ec2717790b9f7f1604e8585f4496da9ce34ce83 Mon Sep 17 00:00:00 2001 From: Joe Latessa Date: Mon, 14 Sep 2026 16:19:51 -0400 Subject: [PATCH 5/7] add missing back slashes workflows file --- .github/workflows/test-build-macos-native.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-build-macos-native.yaml b/.github/workflows/test-build-macos-native.yaml index dbb0407f..dc67d3c4 100644 --- a/.github/workflows/test-build-macos-native.yaml +++ b/.github/workflows/test-build-macos-native.yaml @@ -199,8 +199,8 @@ jobs: -DOpenMP_CXX_LIB_NAMES=omp \ -DOpenMP_omp_LIBRARY="$OPENMP_PREFIX/lib/libomp.dylib" \ -DOpenMP_libomp_LIBRARY="$OPENMP_PREFIX/lib/libomp.dylib" \ - -DBOOST_ROOT="$BOOST_ROOT" - -DBOOST_LIBRARYDIR="$BOOST_ROOT/lib" + -DBOOST_ROOT="$BOOST_ROOT" \ + -DBOOST_LIBRARYDIR="$BOOST_ROOT/lib" \ -DCMAKE_PREFIX_PATH="$BOOST_ROOT;$EIGEN3_CMAKE_DIR" \ -DBoost_NO_BOOST_CMAKE=ON make VERBOSE=1 -j2 From 5c5088f2954aa0eca485e914586b5c4eb2e7d564 Mon Sep 17 00:00:00 2001 From: Joe Latessa Date: Mon, 14 Sep 2026 16:51:33 -0400 Subject: [PATCH 6/7] try boost without pinned version --- .github/workflows/test-build-macos-native.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-build-macos-native.yaml b/.github/workflows/test-build-macos-native.yaml index dc67d3c4..30303fa8 100644 --- a/.github/workflows/test-build-macos-native.yaml +++ b/.github/workflows/test-build-macos-native.yaml @@ -35,7 +35,7 @@ jobs: brew install --formula hdf5 brew install --formula open-mpi brew install --formula gsl - brew install --formula boost@1.85 + brew install --formula boost brew install --formula eigen brew install --formula zlib brew install --formula gcc @@ -183,10 +183,10 @@ jobs: export OpenMP_INCLUDE_DIRS="/opt/homebrew/opt/libomp/include" export SMASH_DIR="${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages/smash/smash_code" export CMAKE_PREFIX_PATH="${EIGEN3_CMAKE_DIR}:$CMAKE_PREFIX_PATH" - BOOST_ROOT="$(brew --prefix boost@1.85)" echo "This is SMASH_DIR: " echo ${SMASH_DIR} ls ${SMASH_DIR} + BOOST_ROOT="$(brew --prefix boost)" cmake .. \ -DUSE_3DGlauber=ON \ -DUSE_MUSIC=ON \ @@ -199,11 +199,8 @@ jobs: -DOpenMP_CXX_LIB_NAMES=omp \ -DOpenMP_omp_LIBRARY="$OPENMP_PREFIX/lib/libomp.dylib" \ -DOpenMP_libomp_LIBRARY="$OPENMP_PREFIX/lib/libomp.dylib" \ - -DBOOST_ROOT="$BOOST_ROOT" \ - -DBOOST_LIBRARYDIR="$BOOST_ROOT/lib" \ - -DCMAKE_PREFIX_PATH="$BOOST_ROOT;$EIGEN3_CMAKE_DIR" \ - -DBoost_NO_BOOST_CMAKE=ON - make VERBOSE=1 -j2 + -DCMAKE_PREFIX_PATH="$BOOST_ROOT;$EIGEN3_CMAKE_DIR" + make -j2 - name: Checkout Default-tunes uses: actions/checkout@v7 From 98c33f5a66a84ece897bd0137d27b0d1a45dc620 Mon Sep 17 00:00:00 2001 From: Joe Latessa Date: Mon, 14 Sep 2026 17:20:39 -0400 Subject: [PATCH 7/7] trying without brew cleanup --- .github/workflows/test-build-macos-native.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-build-macos-native.yaml b/.github/workflows/test-build-macos-native.yaml index 30303fa8..372f8119 100644 --- a/.github/workflows/test-build-macos-native.yaml +++ b/.github/workflows/test-build-macos-native.yaml @@ -28,7 +28,6 @@ jobs: run: | export NONINTERACTIVE=1 brew update - brew cleanup brew install --formula doxygen brew install --formula root brew install --formula graph-tool