diff options
| -rw-r--r-- | .github/workflows/cypress.yml | 49 | ||||
| -rw-r--r-- | package-lock.json | 11 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 38 insertions, 24 deletions
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 66f3b4383fc..2b652ff62ab 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -8,31 +8,32 @@ on: - stable* env: - APP_NAME: viewer - BRANCH: ${{ github.ref }} + APP_NAME: server + BRANCH: ${{ github.base_ref }} TESTING: true jobs: init: runs-on: ubuntu-latest - - if: ${{ github.repository_owner != 'nextcloud-gmbh' }} + outputs: + nodeVersion: ${{ steps.versions.outputs.nodeVersion }} + npmVersion: ${{ steps.versions.outputs.npmVersion }} steps: - - name: Checkout server - uses: actions/checkout@v3 + - name: Checkout app + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - name: Read package.json node and npm engines version - uses: skjnldsv/read-package-engines-version-actions@v1.2 + uses: skjnldsv/read-package-engines-version-actions@0ce2ed60f6df073a62a77c0a4958dd0fc68e32e7 # v2.1 id: versions with: - fallbackNode: "^12" - fallbackNpm: "^6" + fallbackNode: "^14" + fallbackNpm: "^7" - name: Set up node ${{ steps.versions.outputs.nodeVersion }} - uses: actions/setup-node@v3 + uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 with: - cache: "npm" + cache: 'npm' node-version: ${{ steps.versions.outputs.nodeVersion }} - name: Set up npm ${{ steps.versions.outputs.npmVersion }} @@ -44,10 +45,10 @@ jobs: TESTING=true npm run build --if-present - name: Save context - uses: actions/cache@v3 + uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 with: key: cypress-context-${{ github.run_id }} - path: /home/runner/work/server + path: ./ cypress: runs-on: ubuntu-latest @@ -63,14 +64,24 @@ jobs: steps: - name: Restore context - uses: actions/cache@v3 + uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 with: + fail-on-cache-miss: true key: cypress-context-${{ github.run_id }} - path: /home/runner/work/server + path: ./ - - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests + - name: Set up node ${{ needs.init.outputs.nodeVersion }} + uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 + with: + cache: 'npm' + node-version: ${{ needs.init.outputs.nodeVersion }} - uses: cypress-io/github-action@v5 + - name: Set up npm ${{ needs.init.outputs.npmVersion }} + run: npm i -g npm@"${{ needs.init.outputs.npmVersion }}" + + + - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests + uses: cypress-io/github-action@db1693016f23ccf9043f4b2428f9b04e5d502a73 # v5.8.1 with: record: true parallel: true @@ -96,7 +107,7 @@ jobs: run: docker logs nextcloud-cypress-tests-server > nextcloud.log - name: Upload NC logs - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 if: failure() && matrix.containers != 'component' with: name: nc_logs_${{ matrix.containers }} @@ -107,7 +118,7 @@ jobs: run: docker exec nextcloud-cypress-tests-server tar -cvjf - data > data.tar - name: Upload data dir archive - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 if: failure() && matrix.containers != 'component' with: name: nc_data_${{ matrix.containers }} diff --git a/package-lock.json b/package-lock.json index 555d04b1799..d266bd54385 100644 --- a/package-lock.json +++ b/package-lock.json @@ -146,7 +146,7 @@ "tar": "^6.1.15", "ts-loader": "^9.4.2", "ts-node": "^10.9.1", - "tslib": "^2.4.1", + "tslib": "^2.5.3", "typescript": "^4.9.3", "vue-loader": "^15.9.8", "vue-template-compiler": "^2.7.14", @@ -22312,8 +22312,9 @@ } }, "node_modules/tslib": { - "version": "2.5.0", - "license": "0BSD" + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -38876,7 +38877,9 @@ } }, "tslib": { - "version": "2.5.0" + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" }, "tsutils": { "version": "3.21.0", diff --git a/package.json b/package.json index 399475e277a..441b4d8aefb 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,7 @@ "tar": "^6.1.15", "ts-loader": "^9.4.2", "ts-node": "^10.9.1", - "tslib": "^2.4.1", + "tslib": "^2.5.3", "typescript": "^4.9.3", "vue-loader": "^15.9.8", "vue-template-compiler": "^2.7.14", |