diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-05-13 10:17:15 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-05-16 16:39:37 +0200 |
| commit | 236c0a80931f4732c1869280ed227467b6e204fe (patch) | |
| tree | c839ff83197f2ef26496458382c7ed2e3ecf2294 /.github/workflows | |
| parent | 49f94c9d6c8a137b3d75404bef359bb13b52fb6b (diff) | |
| download | mullvadvpn-236c0a80931f4732c1869280ed227467b6e204fe.tar.xz mullvadvpn-236c0a80931f4732c1869280ed227467b6e204fe.zip | |
Update GA workflows
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/desktop-e2e.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/frontend.yml | 19 | ||||
| -rw-r--r-- | .github/workflows/translations.yml | 16 |
3 files changed, 17 insertions, 32 deletions
diff --git a/.github/workflows/desktop-e2e.yml b/.github/workflows/desktop-e2e.yml index 1aeafb9998..eb3fcc061f 100644 --- a/.github/workflows/desktop-e2e.yml +++ b/.github/workflows/desktop-e2e.yml @@ -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/toolchain@v1.0.6 with: @@ -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 @@ -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 diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 4aefa557e2..cb14e4397d 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -26,34 +26,27 @@ jobs: default: true profile: minimal - - name: Read volta info - id: volta - uses: zoexx/github-action-json-file-properties@1.0.6 - 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 @@ -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 diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index ccb81de983..ec6a494fae 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -16,25 +16,16 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Read volta info - id: volta - uses: zoexx/github-action-json-file-properties@1.0.6 - 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 @@ -44,4 +35,5 @@ jobs: default: true - name: Verify translations + shell: bash run: scripts/localization verify |