Skip to content

Commit 4ed2292

Browse files
author
mike dupont
committed
now fixing the output dir
1 parent 13da8db commit 4ed2292

File tree

1 file changed

+11
-22
lines changed

1 file changed

+11
-22
lines changed

.github/workflows/build-action.yml

+11-22
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,13 @@ jobs:
3939

4040
- name: Build o1js
4141
if: steps.cache.outputs.cache-hit != 'true'
42-
shell: bash
4342
run: |
4443
#!/bin/bash
4544
npm ci
4645
npm run build
4746
4847
- name: Count tests
4948
id: count_tests
50-
shell: bash
5149
run: |
5250
#!/bin/bash
5351
TEST_COUNT=$(find ./dist/node -name "*.unit-test.js" | wc -l)
@@ -104,27 +102,28 @@ jobs:
104102
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.ts', '**/*.js') }}
105103

106104
- name: Prepare for tests
107-
shell: bash
108105
run: |
109106
#!/bin/bash
110107
touch profiling.md
111108
112109
- name: Sets MODIFIED_BRANCH_NAME
113110
env:
114111
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
115-
shell: bash
112+
TEST_TYPE: ${{ matrix.test_type }}
116113
run: |
117114
#!/bin/bash
118115
MODIFIED_BRANCH_NAME=${BRANCH_NAME/\//-}
116+
MODIFIED_TEST_TYPE=${TEST_TYPE/\//-}
119117
OUTPUT_DIR="profile/profile-data/${MODIFIED_BRANCH_NAME}"
120-
OUTPUT_TEST_DIR="${OUTPUT_DIR}/profile-data-${{matrix.test_type}}-${{ matrix.perf }}-${{ matrix.node_version }}"
118+
OUTPUT_TEST_DIR="${OUTPUT_DIR}/profile-data-${MODIFIED_TEST_TYPE}-${{ matrix.perf }}-${{ matrix.node_version }}"
119+
OUTPUT_TEST_NAME="profile-data-${MODIFIED_TEST_TYPE}-${{ matrix.perf }}-${{ matrix.node_version }}"
121120
122121
echo "MODIFIED_BRANCH_NAME=${MODIFIED_BRANCH_NAME}" >> "$GITHUB_ENV"
123122
echo "OUTPUT_DIR=${OUTPUT_DIR}" >> "$GITHUB_ENV"
124123
echo "OUTPUT_TEST_DIR=${OUTPUT_TEST_DIR}" >> "$GITHUB_ENV"
124+
echo "OUTPUT_TEST_NAME=${OUTPUT_TEST_NAME}" >> "$GITHUB_ENV"
125125
126126
- name: create dir
127-
shell: bash
128127
run: |
129128
#!/bin/bash
130129
mkdir -p "${{env.OUTPUT_TEST_DIR}}"
@@ -133,26 +132,24 @@ jobs:
133132
env:
134133
TEST_TYPE: ${{ matrix.test_type }}
135134
PERF_TYPE: ${{ matrix.perf }}
136-
shell: bash
137135
run: |
138136
#!/bin/bash
139137
sh run-ci-tests.sh || echo skip errors
140138
mv isolate-*-v8.log "${OUTPUT_TEST_DIR}" || echo ok
141139
mv Heap.*.heapprofile "${OUTPUT_TEST_DIR}" || echo ok
142140
mv CPU.*.cpuprofile "${OUTPUT_TEST_DIR}" || echo ok
141+
find -name \*log
143142
continue-on-error: true
144143

145144
- name: Upload test results
146145
if: always()
147146
uses: actions/upload-artifact@v4
148147
with:
149-
name: test-results-${{env.MODIFIED_BRANCH_NAME}}-${{ matrix.chunk }}-${{ matrix.perf }}-${{ matrix.node_version }}
148+
name: test-results-${{env.OUTPUT_TEST_NAME}}
150149
path: ${{env.OUTPUT_TEST_DIR}}
151150

152-
153151
- name: Add to job summary
154152
if: always()
155-
shell: bash
156153
run: |
157154
#!/bin/bash
158155
echo "### Test Results for ${{ matrix.test_type }}" >> "$GITHUB_STEP_SUMMARY"
@@ -199,12 +196,10 @@ jobs:
199196
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.ts', '**/*.js') }}
200197

201198
- name: Prepare for tests
202-
shell: bash
203199
run: |
204200
#!/bin/bash
205201
touch profiling.md
206202
- name: create dir
207-
shell: bash
208203
run: |
209204
#!/bin/bash
210205
mkdir -p profile/profile-data
@@ -214,10 +209,10 @@ jobs:
214209
- name: Sets MODIFIED_BRANCH_NAME
215210
env:
216211
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
217-
shell: bash
218212
run: |
219213
#!/bin/bash
220214
MODIFIED_BRANCH_NAME=${BRANCH_NAME/\//-}
215+
221216
OUTPUT_DIR="profile/profile-data/${MODIFIED_BRANCH_NAME}"
222217
OUTPUT_TEST_DIR="${OUTPUT_DIR}/profile-data-${{matrix.chunk}}-${{ matrix.perf }}-${{ matrix.node_version }}"
223218
@@ -226,7 +221,6 @@ jobs:
226221
echo "OUTPUT_TEST_DIR=${OUTPUT_TEST_DIR}" >> "$GITHUB_ENV"
227222
228223
- name: create dir
229-
shell: bash
230224
run: |
231225
#!/bin/bash
232226
mkdir -p "${{env.OUTPUT_TEST_DIR}}"
@@ -237,7 +231,6 @@ jobs:
237231
TOTAL_TESTS: ${{ needs.Prepare.outputs.test_count }}
238232
CHUNK: ${{ matrix.chunk }}
239233
CHUNKS: 32
240-
shell: bash
241234
run: |
242235
#!/bin/bash
243236
echo "Total tests: $TOTAL_TESTS"
@@ -311,7 +304,6 @@ jobs:
311304

312305
- name: Add to job summary
313306
if: always()
314-
shell: bash
315307
run: |
316308
#!/bin/bash
317309
echo "### Test Results for Unit Tests Chunk ${{ matrix.chunk }}" >> "$GITHUB_STEP_SUMMARY"
@@ -326,7 +318,6 @@ jobs:
326318
- run: |
327319
#!/bin/bash
328320
echo "All unit tests completed successfully"
329-
shell: bash
330321
331322
Build-And-Test-Web:
332323
needs: Prepare
@@ -362,17 +353,17 @@ jobs:
362353
run: |
363354
#!/bin/bash
364355
npm run e2e:install
365-
shell: bash
356+
366357
367358
- name: Build o1js and prepare the web server
368-
shell: bash
359+
369360
run: |
370361
#!/bin/bash
371362
npm run build:web
372363
npm run e2e:prepare-server
373364
374365
- name: Execute E2E tests
375-
shell: bash
366+
376367
run: |
377368
#!/bin/bash
378369
npm run test:e2e
@@ -405,7 +396,6 @@ jobs:
405396
node-version: '18'
406397

407398
- name: Build o1js
408-
shell: bash
409399
run: |
410400
#!/bin/bash
411401
npm ci
@@ -437,7 +427,6 @@ jobs:
437427
node-version: '18'
438428

439429
- name: Build mina-signer
440-
shell: bash
441430
run: |
442431
#!/bin/bash
443432
npm ci

0 commit comments

Comments
 (0)