Skip to content

Commit bcd0078

Browse files
latessalatessa
authored
Merge pull request #4 from JETSCAPE/XSCAPE-1.1-RC
Xscape 1.1 rc
2 parents 36b2259 + 24de4c2 commit bcd0078

File tree

75 files changed

+12757
-6607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+12757
-6607
lines changed

‎.github/workflows/smash_test_completes.yaml

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: smash test completes
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- XSCAPE-1.1-RC
8+
- XSCAPE-1.1-RC_mergeMUSIC
9+
10+
push:
11+
branches:
12+
- main
13+
- XSCAPE-1.1-RC
14+
- XSCAPE-1.1-RC_mergeMUSIC
15+
16+
env:
17+
REPO_NAME: ${{ github.event.repository.name }}
18+
19+
jobs:
20+
build:
21+
name: build for smash test
22+
runs-on: ubuntu-latest
23+
24+
container:
25+
image: jetscape/base:stable
26+
options: --user root
27+
28+
steps:
29+
30+
- name: Checkout Repository
31+
uses: actions/checkout@v4
32+
with:
33+
path: ${{ github.event.repository.name }}
34+
35+
- name: Download MUSIC
36+
run: |
37+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
38+
./get_music.sh
39+
40+
- name: Download ISS
41+
run: |
42+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
43+
./get_iSS.sh
44+
45+
- name: Download FREESTREAM
46+
run: |
47+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
48+
./get_freestream-milne.sh
49+
50+
- name: Download SMASH
51+
run: |
52+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
53+
./get_smash.sh
54+
55+
- name: Build Application
56+
run: |
57+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}
58+
mkdir build
59+
cd build
60+
export SMASH_DIR="${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages/smash/smash_code"
61+
cmake .. -DUSE_MUSIC=ON -DUSE_ISS=ON -DUSE_FREESTREAM=ON -DUSE_SMASH=ON
62+
make -j6
63+
64+
- name: Run Application
65+
run: |
66+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/build
67+
./runJetscape ../config/jetscape_user_test_smash_RC1_1.xml

‎.github/workflows/test-build-external.yaml

+12-7
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-RC2
8-
- XSCAPE-1.0-for-public-repo
7+
- XSCAPE-1.1-RC
8+
- XSCAPE-1.1-RC_mergeMUSIC
99

1010
push:
1111
branches:
1212
- main
13-
- XSCAPE-RC2
14-
- XSCAPE-1.0-for-public-repo
13+
- XSCAPE-1.1-RC
14+
- XSCAPE-1.1-RC_mergeMUSIC
1515

1616
env:
1717
REPO_NAME: ${{ github.event.repository.name }}
@@ -22,13 +22,13 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
container:
25-
image: jetscape/base:v1.8
25+
image: jetscape/base:stable
2626
options: --user root
2727

2828
steps:
2929

3030
- name: Checkout Repository
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v4
3232
with:
3333
path: ${{ github.event.repository.name }}
3434

@@ -52,11 +52,16 @@ jobs:
5252
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
5353
./get_smash.sh
5454
55+
- name: Download 3DGlauber
56+
run: |
57+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
58+
./get_3dglauber.sh
59+
5560
- name: Build Application
5661
run: |
5762
cd ${GITHUB_WORKSPACE}/${REPO_NAME}
5863
mkdir build
5964
cd build
6065
export SMASH_DIR="${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages/smash/smash_code"
61-
cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_MUSIC=ON -DUSE_ISS=ON -DUSE_FREESTREAM=ON -DUSE_SMASH=ON
66+
cmake .. -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON -DUSE_FREESTREAM=ON -DUSE_SMASH=ON
6267
make -j2

‎.github/workflows/test-events-PbPb.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-RC2
8-
- XSCAPE-1.0-for-public-repo
7+
- XSCAPE-1.1-RC
8+
- XSCAPE-1.1-RC_mergeMUSIC
99

1010
push:
1111
branches:
1212
- main
13-
- XSCAPE-RC2
14-
- XSCAPE-1.0-for-public-repo
13+
- XSCAPE-1.1-RC
14+
- XSCAPE-1.1-RC_mergeMUSIC
1515

1616
env:
1717
REPO_NAME: ${{ github.event.repository.name }}
@@ -22,13 +22,13 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
container:
25-
image: jetscape/base:v1.8
25+
image: jetscape/base:stable
2626
options: --user root
2727

2828
steps:
2929

3030
- name: Checkout Repository
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v4
3232
with:
3333
path: ${{ github.event.repository.name }}
3434

@@ -37,11 +37,11 @@ jobs:
3737
cd ${GITHUB_WORKSPACE}/${REPO_NAME}
3838
mkdir build
3939
cd build
40-
cmake .. -DCMAKE_CXX_STANDARD=14
40+
cmake ..
4141
make -j2
4242
4343
- name: Checkout TEST-EXAMPLES
44-
uses: actions/checkout@v2
44+
uses: actions/checkout@v4
4545
with:
4646
repository: JETSCAPE/TEST-EXAMPLES
4747
path: TEST-EXAMPLES

‎.github/workflows/test-events-Pythia-Isr-Dat.yaml

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
name: build+regression test Pythia-ISR Dat Output
22

33
on:
4+
workflow_dispatch:
5+
46
pull_request:
57
branches:
68
- main
7-
- XSCAPE-RC2
8-
- XSCAPE-1.0-for-public-repo
9+
- XSCAPE-1.1-RC
10+
- XSCAPE-1.1-RC_mergeMUSIC
911

1012
push:
1113
branches:
1214
- main
13-
- XSCAPE-RC2
14-
- XSCAPE-1.0-for-public-repo
15+
- XSCAPE-1.1-RC
16+
- XSCAPE-1.1-RC_mergeMUSIC
1517

1618
env:
1719
REPO_NAME: ${{ github.event.repository.name }}
@@ -22,13 +24,13 @@ jobs:
2224
runs-on: ubuntu-latest
2325

2426
container:
25-
image: jetscape/base:v1.8
27+
image: jetscape/base:stable
2628
options: --user root
2729

2830
steps:
2931

3032
- name: Checkout Repository
31-
uses: actions/checkout@v2
33+
uses: actions/checkout@v4
3234
with:
3335
path: ${{ github.event.repository.name }}
3436

@@ -44,11 +46,11 @@ jobs:
4446
cd ${GITHUB_WORKSPACE}/${REPO_NAME}
4547
mkdir build
4648
cd build
47-
cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
49+
cmake .. -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
4850
make -j2
4951
5052
- name: Checkout TEST-EXAMPLES
51-
uses: actions/checkout@v2
53+
uses: actions/checkout@v4
5254
with:
5355
repository: JETSCAPE/TEST-EXAMPLES
5456
path: TEST-EXAMPLES

‎.github/workflows/test-events-Pythia-Isr-Hadron.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-RC2
8-
- XSCAPE-1.0-for-public-repo
7+
- XSCAPE-1.1-RC
8+
- XSCAPE-1.1-RC_mergeMUSIC
99

1010
push:
1111
branches:
1212
- main
13-
- XSCAPE-RC2
14-
- XSCAPE-1.0-for-public-repo
13+
- XSCAPE-1.1-RC
14+
- XSCAPE-1.1-RC_mergeMUSIC
1515

1616
env:
1717
REPO_NAME: ${{ github.event.repository.name }}
@@ -22,13 +22,13 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
container:
25-
image: jetscape/base:v1.8
25+
image: jetscape/base:stable
2626
options: --user root
2727

2828
steps:
2929

3030
- name: Checkout Repository
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v4
3232
with:
3333
path: ${{ github.event.repository.name }}
3434

@@ -44,11 +44,11 @@ jobs:
4444
cd ${GITHUB_WORKSPACE}/${REPO_NAME}
4545
mkdir build
4646
cd build
47-
cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
47+
cmake .. -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
4848
make -j2
4949
5050
- name: Checkout TEST-EXAMPLES
51-
uses: actions/checkout@v2
51+
uses: actions/checkout@v4
5252
with:
5353
repository: JETSCAPE/TEST-EXAMPLES
5454
path: TEST-EXAMPLES

‎.github/workflows/test-events-Pythia-Isr-Parton.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-RC2
8-
- XSCAPE-1.0-for-public-repo
7+
- XSCAPE-1.1-RC
8+
- XSCAPE-1.1-RC_mergeMUSIC
99

1010
push:
1111
branches:
1212
- main
13-
- XSCAPE-RC2
14-
- XSCAPE-1.0-for-public-repo
13+
- XSCAPE-1.1-RC
14+
- XSCAPE-1.1-RC_mergeMUSIC
1515

1616
env:
1717
REPO_NAME: ${{ github.event.repository.name }}
@@ -22,13 +22,13 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
container:
25-
image: jetscape/base:v1.8
25+
image: jetscape/base:stable
2626
options: --user root
2727

2828
steps:
2929

3030
- name: Checkout Repository
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v4
3232
with:
3333
path: ${{ github.event.repository.name }}
3434

@@ -44,11 +44,11 @@ jobs:
4444
cd ${GITHUB_WORKSPACE}/${REPO_NAME}
4545
mkdir build
4646
cd build
47-
cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
47+
cmake .. -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
4848
make -j2
4949
5050
- name: Checkout TEST-EXAMPLES
51-
uses: actions/checkout@v2
51+
uses: actions/checkout@v4
5252
with:
5353
repository: JETSCAPE/TEST-EXAMPLES
5454
path: TEST-EXAMPLES

‎.github/workflows/test-events-pp.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-RC2
8-
- XSCAPE-1.0-for-public-repo
7+
- XSCAPE-1.1-RC
8+
- XSCAPE-1.1-RC_mergeMUSIC
99

1010
push:
1111
branches:
1212
- main
13-
- XSCAPE-RC2
14-
- XSCAPE-1.0-for-public-repo
13+
- XSCAPE-1.1-RC
14+
- XSCAPE-1.1-RC_mergeMUSIC
1515

1616
env:
1717
REPO_NAME: ${{ github.event.repository.name }}
@@ -22,13 +22,13 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
container:
25-
image: jetscape/base:v1.8
25+
image: jetscape/base:stable
2626
options: --user root
2727

2828
steps:
2929

3030
- name: Checkout Repository
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v4
3232
with:
3333
path: ${{ github.event.repository.name }}
3434

@@ -37,11 +37,11 @@ jobs:
3737
cd ${GITHUB_WORKSPACE}/${REPO_NAME}
3838
mkdir build
3939
cd build
40-
cmake .. -DCMAKE_CXX_STANDARD=14
40+
cmake ..
4141
make -j2
4242
4343
- name: Checkout TEST-EXAMPLES
44-
uses: actions/checkout@v2
44+
uses: actions/checkout@v4
4545
with:
4646
repository: JETSCAPE/TEST-EXAMPLES
4747
path: TEST-EXAMPLES

0 commit comments

Comments
 (0)