Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/smash_test_completes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
steps:

- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
path: ${{ github.event.repository.name }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-build-external.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
steps:

- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
path: ${{ github.event.repository.name }}

Expand Down
33 changes: 18 additions & 15 deletions .github/workflows/test-build-macos-native.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ jobs:
run: |
export NONINTERACTIVE=1
brew update
brew cleanup
brew install --formula doxygen
brew install --formula root
brew install --formula graph-tool
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
Expand Down Expand Up @@ -119,17 +118,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
Expand All @@ -138,7 +142,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 }}

Expand Down Expand Up @@ -178,10 +182,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 \
Expand All @@ -194,12 +198,11 @@ jobs:
-DOpenMP_CXX_LIB_NAMES=omp \
-DOpenMP_omp_LIBRARY="$OPENMP_PREFIX/lib/libomp.dylib" \
-DOpenMP_libomp_LIBRARY="$OPENMP_PREFIX/lib/libomp.dylib" \
-DCMAKE_PREFIX_PATH="$BOOST_ROOT;$EIGEN3_CMAKE_DIR" \
-DBoost_NO_BOOST_CMAKE=ON
-DCMAKE_PREFIX_PATH="$BOOST_ROOT;$EIGEN3_CMAKE_DIR"
make -j2

- name: Checkout Default-tunes
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
repository: JETSCAPE/Default-tunes
ref: main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-build-nPDF.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:

- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
path: ${{ github.event.repository.name }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-code-format.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
steps:

- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
path: ${{ github.event.repository.name }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-events-PbPb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:

- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
path: ${{ github.event.repository.name }}

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-events-Pythia-Isr-Dat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:

- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
path: ${{ github.event.repository.name }}

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-events-Pythia-Isr-Hadron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:

- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
path: ${{ github.event.repository.name }}

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-events-Pythia-Isr-Parton.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:

- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
path: ${{ github.event.repository.name }}

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-events-brick.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:

- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
path: ${{ github.event.repository.name }}

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-events-pp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:

- name: Checkout Repository
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
path: ${{ github.event.repository.name }}

Expand All @@ -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
Expand Down
Loading