Skip to content

Commit 56f9619

Browse files
committed
fix ci test
1 parent b6ca2e6 commit 56f9619

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
5353
run: |
5454
xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/clas_005038.evio.00000 ./
55-
xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-l/clas_021559.evio.00000 ./
55+
xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-l/clas_021559.evio.00001 ./
5656
5757
# build
5858
#############################################################################
@@ -89,14 +89,18 @@ jobs:
8989
if: ${{ github.ref_type == 'tag' }}
9090
run: libexec/version-bump.sh ${{ github.ref_name }}
9191
- name: build
92-
run: ./build-coatjava.sh --xrootd --no-progress -T${{ env.nthreads }}
92+
run: ./build-coatjava.sh --clara --xrootd --no-progress -T${{ env.nthreads }}
9393
- name: tar # tarball to preserve permissions
94-
run: tar czvf coatjava.tar.gz coatjava
94+
run: |
95+
tar czvf coatjava.tar.gz coatjava
96+
tar czvf clara.tar.gz clara
9597
- uses: actions/upload-artifact@v4
9698
with:
9799
name: build_${{ matrix.runner }}
98100
retention-days: 1
99-
path: coatjava.tar.gz
101+
path: |
102+
coatjava.tar.gz
103+
clara.tar.gz
100104
101105
# tests
102106
#############################################################################
@@ -158,10 +162,9 @@ jobs:
158162
./coatjava/bin/decoder -n 10000 -o dog.hipo ./clas_005038.evio.00000
159163
160164
test_clara:
161-
needs: [ build ]
165+
needs: [ build, download_test_data ]
162166
strategy:
163167
fail-fast: true
164-
steps:
165168
runs-on: ubuntu-latest
166169
steps:
167170
- uses: actions/checkout@v5
@@ -172,13 +175,18 @@ jobs:
172175
distribution: ${{ env.java_distribution }}
173176
- uses: actions/download-artifact@v5
174177
with:
175-
name: build_${{ matrix.runner }}
178+
name: build_ubuntu-latest
179+
- uses: actions/cache/restore@v4
180+
with:
181+
key: raw_test_data
182+
path: clas_021559.evio.00001
176183
- name: untar build
177184
run: |
178185
tar xzvf clara.tar.gz
179186
- name: run test
180187
run: |
181-
./coatjava/bin/run-clara -y ./etc/services/rgl-clarode.yml ${{ env.nthreads }} -n 1000 -c ./clara ./clas_021559.evio.00000
188+
ls -lhtr
189+
./clara/plugins/clas12/bin/run-clara -y ./etc/services/rgl-clarode.yml -t ${{ env.nthreads }} -n 200 -c ./clara -o ./tmp ./clas_021559.evio.00001
182190
ls -lhtr
183191
184192
test_coatjava:

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ download:
4444
stage: build
4545
script:
4646
- xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/clas_005038.evio.00000 ./
47-
- xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-l/clas_021559.evio.00000 ./
47+
- xrdcp xroot://sci-xrootd.jlab.org///osgpool/hallb/clas12/validation/raw/rg-l/clas_021559.evio.00001 ./
4848
artifacts:
4949
when: always
5050
expire_in: 1 day
@@ -124,7 +124,7 @@ clara:
124124
tar -xzf clara.tar.gz &&
125125
./clara/plugins/clas12/bin/run-clara -c ./clara
126126
-t $JL_RUNNER_AVAIL_CPU -y ./etc/services/rgl-clarode.yml
127-
-n 100 -o ./out clas_02*.hipo
127+
-n 100 -o ./out clas_021*.hipo
128128
129129
profile:
130130
stage: test

0 commit comments

Comments
 (0)