summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorHank <hank@mullvad.net>2022-11-07 13:44:42 +0100
committerHank <hank@mullvad.net>2022-11-07 13:44:42 +0100
commit735601ed34ab83fa4443424aa2ddf9068b27f6bd (patch)
tree148dcf48283b6ead6a8d203c53537ee191777408
parentdc600ecd8c2e3bc29714e65285dcdf4584fc3cec (diff)
parent74021ac5069af7f8ed551d1beb7736e75d0b9ab5 (diff)
downloadmullvadvpn-735601ed34ab83fa4443424aa2ddf9068b27f6bd.tar.xz
mullvadvpn-735601ed34ab83fa4443424aa2ddf9068b27f6bd.zip
Merge branch 'update-frontend-workflow'
-rw-r--r--.github/workflows/frontend.yml20
1 files changed, 13 insertions, 7 deletions
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 37518bb50e..b1a8153411 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -8,6 +8,7 @@ on:
- mullvad-management-interface/proto/**
# Build if requested manually from the Actions tab
workflow_dispatch:
+
jobs:
check-frontend:
strategy:
@@ -17,14 +18,15 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Setup volta
uses: volta-cli/action@v4
- name: Get npm cache directory path
id: npm-cache-dir-path
- run: echo "::set-output name=dir::$(npm config get cache)"
+ shell: bash # To ensure that Windows correctly ouputs the cache path
+ run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
- name: Cache npm dependencies
uses: actions/cache@v3
@@ -47,11 +49,15 @@ jobs:
working-directory: gui
run: npm run build
- - name: Run headless test
- uses: GabrielBB/xvfb-action@v1
- with:
- working-directory: gui
- run: npm test
+ - name: Run headless test Linux
+ if: runner.os == 'Linux'
+ working-directory: gui
+ run: xvfb-run -a npm test
+
+ - name: Run headless test Windows
+ if: runner.os != 'Linux'
+ working-directory: gui
+ run: npm test
- name: Run Playwright tests
working-directory: gui