Skip to content

Commit fafdfbd

Browse files
Make it work with github???
ok this is the start of 30 minutes of pain
1 parent 12be47e commit fafdfbd

2 files changed

Lines changed: 21 additions & 21 deletions

File tree

.github/workflows/automatedTesting.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,25 @@ jobs:
1212
steps:
1313
- name: Checkout repository
1414
uses: actions/checkout@v4.1.1
15+
- name: Setup Node
16+
uses: actions/setup-node@v5
1517
- name: Validate JSON Data
1618
run: |
17-
npm install @actions/core ajv strip-json-comments@3.1.1
18-
node tests/validateJsonData.js
19+
npm ci -w validate_json_data
20+
node run test -w validate_json_data
1921
check-block-translation-coverage:
2022
name: Check Block Translation Coverage
2123
needs: validate-json-data
2224
runs-on: ubuntu-latest
2325
steps:
2426
- name: Checkout repository
2527
uses: actions/checkout@v4.1.1
28+
- name: Setup Node
29+
uses: actions/setup-node@v5
2630
- name: Check block translation coverage
2731
run: |
28-
npm install @actions/core puppeteer mime-types
29-
node tests/checkBlockTranslationCoverage.js
32+
npm ci -w check_block_translation_coverage
33+
node run test -w check_block_translation_coverage
3034
test-sample-structures:
3135
name: Test Sample Structures
3236
needs: [validate-json-data, check-block-translation-coverage]
@@ -38,25 +42,21 @@ jobs:
3842
steps:
3943
- name: Checkout repository
4044
uses: actions/checkout@v4.1.1
41-
- name: Build
45+
- name: Setup Node
46+
uses: actions/setup-node@v5
47+
- name: Test Sample Structures on ${{ matrix.browser }}
4248
run: |
43-
cd pipeline
44-
npm ci
45-
cd ..
46-
node pipeline/build.js --export-holoprint-lib
49+
npm ci -w pipeline -w test_sample_structures
50+
if [[ "${{ matrix.browser }}" == "Firefox" ]]; then
51+
npx puppeteer browsers install firefox
52+
fi
53+
npm run test -w test_sample_structures -- ${{ matrix.browser }}
4754
- name: Upload built code
48-
if: matrix.browser == 'Firefox'
55+
if: always() && matrix.browser == 'Firefox'
4956
uses: actions/upload-artifact@v4.4.3
5057
with:
5158
name: build
5259
path: dist
53-
- name: Test Sample Structures on ${{ matrix.browser }}
54-
run: |
55-
npm install @actions/core puppeteer mime-types
56-
if [[ "${{ matrix.browser }}" == "Firefox" ]]; then
57-
npx puppeteer browsers install firefox
58-
fi
59-
node tests/testSampleStructures.js ${{ matrix.browser }}
6060
- name: Upload completed packs as artifacts
6161
if: always()
6262
uses: actions/upload-artifact@v4.4.0

.github/workflows/buildAndDeploy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
steps:
1313
- name: Checkout repository
1414
uses: actions/checkout@v4.1.1
15+
- name: Setup Node
16+
uses: actions/setup-node@v5
1517
- name: Build
1618
run: |
17-
cd pipeline
18-
npm ci
19-
cd ..
20-
node pipeline/build.js --version=${{ github.ref_name }} && rm -r tests
19+
npm ci -w pipeline
20+
npm run build -- -- --version=${{ github.ref_name }}
2121
- name: Upload files as artifact
2222
uses: actions/upload-pages-artifact@v3.0.1
2323
with:

0 commit comments

Comments
 (0)