Skip to content

Commit

Permalink
Merge branch 'update-test-executable-pack' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
dlon committed May 16, 2024
2 parents 816d407 + 236c0a8 commit 57253b3
Show file tree
Hide file tree
Showing 10 changed files with 274 additions and 1,076 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/desktop-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,11 @@ jobs:
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
node-version: 18
node-version-file: gui/package.json
cache: 'npm'
cache-dependency-path: gui/package-lock.json
- name: Install Rust
uses: actions-rs/[email protected]
with:
Expand All @@ -182,8 +183,6 @@ jobs:
vs-version: 16
- name: Build app
shell: bash
# TODO: For some reason, 'npm run pack:win' wants to publish the artifacts
continue-on-error: true
run: ./build.sh
- name: Build test executable
shell: bash
Expand Down Expand Up @@ -242,10 +241,9 @@ jobs:
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
node-version: 18
node-version-file: gui/package.json
cache: 'npm'
cache-dependency-path: gui/package-lock.json
- name: Build app
Expand Down
19 changes: 7 additions & 12 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,27 @@ jobs:
default: true
profile: minimal

- name: Read volta info
id: volta
uses: zoexx/[email protected]
with:
file_path: 'gui/package.json'
prop_path: 'volta'

- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ steps.volta.outputs.node }}
node-version-file: gui/package.json
cache: 'npm'
cache-dependency-path: gui/package-lock.json

- name: Update NPM
run: npm i -g npm@${{ steps.volta.outputs.npm }}

- name: Install dependencies
working-directory: gui
shell: bash
run: npm ci

- name: Check formatting
if: matrix.os == 'ubuntu-latest'
working-directory: gui
shell: bash
run: npm run lint

- name: Build
working-directory: gui
shell: bash
run: npm run build

- name: Run headless test Linux
Expand All @@ -64,8 +57,10 @@ jobs:
- name: Run headless test Windows
if: runner.os != 'Linux'
working-directory: gui
shell: bash
run: npm test

- name: Run Playwright tests
working-directory: gui
shell: bash
run: npm run e2e:no-build
16 changes: 4 additions & 12 deletions .github/workflows/translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,16 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Read volta info
id: volta
uses: zoexx/[email protected]
with:
file_path: 'gui/package.json'
prop_path: 'volta'

- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ steps.volta.outputs.node }}
node-version-file: gui/package.json
cache: 'npm'
cache-dependency-path: gui/package-lock.json

- name: Update NPM
run: npm i -g npm@${{ steps.volta.outputs.npm }}

- name: Install JS dependencies
working-directory: gui
shell: bash
run: npm ci

- name: Install Rust
Expand All @@ -44,4 +35,5 @@ jobs:
default: true

- name: Verify translations
shell: bash
run: scripts/localization verify
6 changes: 0 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
/target/
/gui/node_modules
/gui/build
/gui/scripts/out/
/gui/src/main/management_interface/
/gui/test/e2e/screenshots/
/gui/test-results/
/build/
/dist
.idea/
Expand Down
7 changes: 7 additions & 0 deletions gui/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/node_modules
/build
/scripts/out/
/src/main/management_interface/
/test/e2e/screenshots/
/test-results/
/standalone-tests.sea.blob
Loading

0 comments on commit 57253b3

Please sign in to comment.