From c4eea0df15ce0cfa0423addab0b042bf1efc139b Mon Sep 17 00:00:00 2001 From: skjnldsv Date: Wed, 11 Sep 2024 09:57:04 +0200 Subject: [PATCH 1/2] chore: update cypress workflow deps Signed-off-by: skjnldsv --- .github/workflows/cypress.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 0f79104d0b..b260e27e23 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -43,14 +43,14 @@ jobs: steps: - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 with: node-version: ${{ matrix.node-version }} - name: Set up npm7 run: npm i -g npm@7 - name: Checkout server - uses: actions/checkout@v3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: repository: nextcloud/server ref: ${{ matrix.server-versions }} @@ -63,26 +63,26 @@ jobs: git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - name: Checkout viewer - uses: actions/checkout@v3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: repository: nextcloud/viewer ref: ${{ matrix.server-versions }} path: apps/viewer - name: Checkout files_pdfviewer - uses: actions/checkout@v3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: repository: nextcloud/files_pdfviewer ref: ${{ matrix.server-versions }} path: apps/files_pdfviewer - name: Checkout ${{ env.APP_NAME }} - uses: actions/checkout@v2 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: path: apps/${{ env.APP_NAME }} - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v2 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: ${{ matrix.php-versions }} extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd, apcu @@ -126,7 +126,7 @@ jobs: cat data/nextcloud.log - name: Cache node modules - uses: actions/cache@v2 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 env: cache-name: cache-node-modules with: @@ -144,7 +144,7 @@ jobs: npm run dev - name: Cypress run - uses: cypress-io/github-action@v6 + uses: cypress-io/github-action@496e7dc0edc421a9de8a36a31c793340e00c61bf # v6.7.5 with: record: false parallel: false @@ -164,7 +164,7 @@ jobs: CODE_RELEASE: ${{ matrix.code-image }} - name: Upload test failure screenshots - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 if: failure() with: name: Upload screenshots @@ -172,7 +172,7 @@ jobs: retention-days: 5 - name: Upload nextcloud logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 if: failure() with: name: Upload nextcloud log From c9fa7e0cde8dab31cde5a4001c01d1cdec82c423 Mon Sep 17 00:00:00 2001 From: skjnldsv Date: Wed, 11 Sep 2024 10:08:33 +0200 Subject: [PATCH 2/2] fix(cypress): read npm and node versions from package.json Signed-off-by: skjnldsv --- .github/workflows/cypress.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index b260e27e23..ad76391f56 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -42,13 +42,6 @@ jobs: - "9980:9980" steps: - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 - with: - node-version: ${{ matrix.node-version }} - - name: Set up npm7 - run: npm i -g npm@7 - - name: Checkout server uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: @@ -81,6 +74,21 @@ jobs: with: path: apps/${{ env.APP_NAME }} + - name: Read package.json node and npm engines version + uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3 + id: versions + with: + fallbackNode: "^20" + fallbackNpm: "^10" + + - name: Set up node ${{ steps.versions.outputs.nodeVersion }} + uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 + with: + node-version: ${{ steps.versions.outputs.nodeVersion }} + + - name: Set up npm ${{ steps.versions.outputs.npmVersion }} + run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}' + - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: