diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-04-04 11:59:05 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-04-04 11:59:05 +0200 |
| commit | 600414493597fb49357becdf2616e453f726dd19 (patch) | |
| tree | 148b84e0b72a97b7d01f2e70b4978cab19d73e26 | |
| parent | 090566b45ea18793a83d108328628079c385ef57 (diff) | |
| parent | c1d4052f4f7a89a1ec9d85f5df7f53e59f3efa2a (diff) | |
| download | mullvadvpn-600414493597fb49357becdf2616e453f726dd19.tar.xz mullvadvpn-600414493597fb49357becdf2616e453f726dd19.zip | |
Merge branch 'fix-frontend-job'
| -rw-r--r-- | .github/workflows/frontend.yml | 13 | ||||
| -rw-r--r-- | .github/workflows/translations.yml | 16 | ||||
| -rw-r--r-- | gui/package-lock.json | 23 |
3 files changed, 38 insertions, 14 deletions
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 78d879d9e3..28aa6e2ad7 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -23,20 +23,21 @@ jobs: uses: actions/checkout@v2 - name: Setup Node.js environment - uses: actions/setup-node@v2.1.5 + uses: actions/setup-node@v3 with: node-version: '16.9.1' + cache: 'npm' + cache-dependency-path: gui/package-lock.json - name: Update NPM run: npm i -g npm - - name: Install and cache dependencies - uses: bahmutov/npm-install@v1 - with: - working-directory: gui - install-command: npm ci + - name: Install dependencies + working-directory: gui + run: npm ci - name: Check formatting + if: matrix.os == 'ubuntu-latest' working-directory: gui run: npm run lint diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index dead997706..1fd46c98d6 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -16,19 +16,19 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Install Node.js - uses: actions/setup-node@v2 + - name: Setup Node.js environment + uses: actions/setup-node@v3 with: - node-version: '14' + node-version: '16.9.1' + cache: 'npm' + cache-dependency-path: gui/package-lock.json - name: Update NPM run: npm i -g npm - - name: Install and cache JS dependencies - uses: bahmutov/npm-install@v1 - with: - working-directory: gui - install-command: npm ci + - name: Install JS dependencies + working-directory: gui + run: npm ci - name: Install nightly Rust uses: ATiltedTree/setup-rust@v1.0.4 diff --git a/gui/package-lock.json b/gui/package-lock.json index 38f39709e5..84748b17bb 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -12292,6 +12292,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/string.prototype.trimend": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", + "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/string.prototype.trimstart": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", @@ -23863,6 +23876,16 @@ "side-channel": "^1.0.4" } }, + "string.prototype.trimend": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", + "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + }, "string.prototype.trimstart": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", |