From 0b7cbb72b6636c7014c534e1d514909318af3681 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 11 Mar 2024 16:28:35 +0100 Subject: [PATCH 1/5] Update GitHub actions checkout, cache and upload-artifact from v3 to v4 This fixes several CI warnings like this one: Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3, actions/cache@v3, actions/upload-artifact@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/. Signed-off-by: Stefan Weil --- .github/workflows/automated-tests.yml | 20 ++++++++++---------- .github/workflows/deploy-docs.yml | 2 +- .github/workflows/ts-code-compilation.yml | 2 +- .github/workflows/ts-code-validation.yml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 6c0ee2e6d3..00ba8b568b 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -75,7 +75,7 @@ jobs: - package: others build-list: bbb-mkclean bbb-pads bbb-libreoffice-docker bbb-transcription-controller bigbluebutton bbb-livekit steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Merge branches uses: ./.github/actions/merge-branches - name: Set cache-key vars @@ -90,7 +90,7 @@ jobs: - name: Handle cache if: matrix.cache-files-list != '' id: cache-action - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: artifacts.tar key: ${{ runner.os }}-${{ matrix.package }}-${{ env.BIGBLUEBUTTON_RELEASE }}-commits-${{ env.CACHE_KEY_FILES }}-urls-${{ env.CACHE_KEY_URLS }} @@ -102,7 +102,7 @@ jobs: echo "${{ matrix.build-list || matrix.package }}" | xargs -n 1 ./build/setup.sh tar cvf artifacts.tar artifacts/ - name: Archive packages - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: artifacts_${{ matrix.package }}.tar path: artifacts.tar @@ -114,7 +114,7 @@ jobs: matrix: shard: [1/8, 2/8, 3/8, 4/8, 5/8, 6/8, 7/8, 8/8] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Merge branches uses: ./.github/actions/merge-branches - run: ./build/get_external_dependencies.sh @@ -309,7 +309,7 @@ jobs: ' - if: always() && github.event_name == 'pull_request' name: Upload blob report to GitHub Actions Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: all-blob-reports path: bigbluebutton-tests/playwright/blob-report @@ -340,12 +340,12 @@ jobs: echo "MATRIX_SHARD=$(echo ${{ matrix.shard }} | tr '/' '_')" >> $GITHUB_ENV EOF - if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bbb-configs-${{ env.MATRIX_SHARD }} path: configs - if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bbb-logs-${{ env.MATRIX_SHARD }} path: ./bbb-logs.tar.gz @@ -354,7 +354,7 @@ jobs: needs: install-and-run-tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: node-version: 18 @@ -370,7 +370,7 @@ jobs: working-directory: ./bigbluebutton-tests/playwright run: npx playwright merge-reports --reporter html ./all-blob-reports - name: Upload HTML tests report - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: tests-report path: | @@ -385,7 +385,7 @@ jobs: echo ${{ github.run_id }} > ./pr-comment-data/workflow_id - name: Upload PR data for auto-comment if: github.event_name == 'pull_request' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: pr-comment-data path: pr-comment-data diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 6679d1b706..109d9358ff 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -22,7 +22,7 @@ jobs: working-directory: ./docs steps: # Setup - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: node-version: 20 diff --git a/.github/workflows/ts-code-compilation.yml b/.github/workflows/ts-code-compilation.yml index 3ff412f2a9..2b3a78ee23 100644 --- a/.github/workflows/ts-code-compilation.yml +++ b/.github/workflows/ts-code-compilation.yml @@ -23,7 +23,7 @@ jobs: ts-code-compilation: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 1 - name: Merge branches diff --git a/.github/workflows/ts-code-validation.yml b/.github/workflows/ts-code-validation.yml index 2e6836819c..7c50f75610 100644 --- a/.github/workflows/ts-code-validation.yml +++ b/.github/workflows/ts-code-validation.yml @@ -23,7 +23,7 @@ jobs: ts-code-validation: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 1 - name: Merge branches From 38da48f347fb88ca496c681114b83eeceded438b Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 23 Mar 2024 14:44:38 +0100 Subject: [PATCH 2/5] Update more GitHub actions from v3 to v4 Signed-off-by: Stefan Weil --- .github/actions/merge-branches/action.yml | 2 +- .github/workflows/automated-tests.yml | 30 +++++++++++------------ .github/workflows/deploy-docs.yml | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/actions/merge-branches/action.yml b/.github/actions/merge-branches/action.yml index e171711fbe..ea8fc99e42 100644 --- a/.github/actions/merge-branches/action.yml +++ b/.github/actions/merge-branches/action.yml @@ -6,7 +6,7 @@ runs: using: "composite" steps: - name: Checkout ${{ github.event.pull_request.base.ref || 'master' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.base.ref || '' }} fetch-depth: 0 # Fetch all history diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 00ba8b568b..c41c6b5390 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -119,67 +119,67 @@ jobs: uses: ./.github/actions/merge-branches - run: ./build/get_external_dependencies.sh - name: Download artifacts_bbb-apps-akka - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_bbb-apps-akka.tar - run: tar xf artifacts.tar - name: Download artifacts_bbb-config - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_bbb-config.tar - run: tar xf artifacts.tar - name: Download artifacts_bbb-export-annotations - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_bbb-export-annotations.tar - run: tar xf artifacts.tar - name: Download artifacts_bbb-learning-dashboard - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_bbb-learning-dashboard.tar - run: tar xf artifacts.tar - name: Download artifacts_bbb-playback-record - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_bbb-playback-record.tar - run: tar xf artifacts.tar - name: Download artifacts_bbb-graphql-server - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_bbb-graphql-server.tar - run: tar xf artifacts.tar - name: Download artifacts_bbb-etherpad - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_bbb-etherpad.tar - run: tar xf artifacts.tar - name: Download artifacts_bbb-freeswitch - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_bbb-freeswitch.tar - run: tar xf artifacts.tar - name: Download artifacts_bbb-webrtc - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_bbb-webrtc.tar - run: tar xf artifacts.tar - name: Download artifacts_bbb-web - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_bbb-web.tar - run: tar xf artifacts.tar - name: Download artifacts_bbb-fsesl-akka - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_bbb-fsesl-akka.tar - run: tar xf artifacts.tar - name: Download artifacts_bbb-html5 - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_bbb-html5.tar - run: tar xf artifacts.tar - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts_others.tar - run: tar xf artifacts.tar @@ -355,14 +355,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 - name: Install dependencies working-directory: ./bigbluebutton-tests/playwright run: npm ci - name: Download all blob reports from GitHub Actions Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: all-blob-reports path: bigbluebutton-tests/playwright/all-blob-reports diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 109d9358ff..0e07e0f5e0 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -23,7 +23,7 @@ jobs: steps: # Setup - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 20 cache: npm From 0f726d53d6e2795e31ff1500b2e02705ed3d4f8f Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 23 Mar 2024 15:26:14 +0100 Subject: [PATCH 3/5] Change upload and download to work with v4 Signed-off-by: Stefan Weil --- .github/workflows/automated-tests.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index c41c6b5390..121ef277b5 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -112,7 +112,9 @@ jobs: strategy: fail-fast: false matrix: - shard: [1/8, 2/8, 3/8, 4/8, 5/8, 6/8, 7/8, 8/8] + shard: [1, 2, 3, 4, 5, 6, 7, 8] + env: + shard: ${{ matrix.shard }}/8 steps: - uses: actions/checkout@v4 - name: Merge branches @@ -285,7 +287,7 @@ jobs: max_attempts: 3 command: | cd ./bigbluebutton-tests/playwright - npm run test-chromium-ci -- --shard ${{ matrix.shard }} + npm run test-chromium-ci -- --shard ${{ env.shard }} env: NODE_EXTRA_CA_CERTS: /usr/local/share/ca-certificates/bbb-dev/bbb-dev-ca.crt ACTIONS_RUNNER_DEBUG: true @@ -305,13 +307,13 @@ jobs: run: | sh -c ' find $HOME/.cache/ms-playwright -name libnssckbi.so -exec rm {} \; -exec ln -s /usr/lib/x86_64-linux-gnu/pkcs11/p11-kit-trust.so {} \; - npm run test-firefox-ci -- --shard ${{ matrix.shard }} + npm run test-firefox-ci -- --shard ${{ env.shard }} ' - if: always() && github.event_name == 'pull_request' name: Upload blob report to GitHub Actions Artifacts uses: actions/upload-artifact@v4 with: - name: all-blob-reports + name: all-blob-reports-${{ matrix.shard }} path: bigbluebutton-tests/playwright/blob-report - if: failure() name: Prepare artifacts (configs and logs) @@ -337,7 +339,7 @@ jobs: chmod a+r -R /home/runner/work/bigbluebutton/bigbluebutton/configs bbb-conf --zip ls -t /root/*.tar.gz | head -1 | xargs -I '{}' cp '{}' /home/runner/work/bigbluebutton/bigbluebutton/bbb-logs.tar.gz - echo "MATRIX_SHARD=$(echo ${{ matrix.shard }} | tr '/' '_')" >> $GITHUB_ENV + echo "MATRIX_SHARD=${{ matrix.shard }}_8" >> $GITHUB_ENV EOF - if: failure() uses: actions/upload-artifact@v4 @@ -364,8 +366,9 @@ jobs: - name: Download all blob reports from GitHub Actions Artifacts uses: actions/download-artifact@v4 with: - name: all-blob-reports + pattern: all-blob-reports-* path: bigbluebutton-tests/playwright/all-blob-reports + merge-multiple: true - name: Merge into HTML Report working-directory: ./bigbluebutton-tests/playwright run: npx playwright merge-reports --reporter html ./all-blob-reports From 2c374aa3b74e165bc51a169c5420d2ac0f606d42 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 23 Mar 2024 18:10:27 +0100 Subject: [PATCH 4/5] Update GitHub action eps1lon/actions-label-merge-conflict Signed-off-by: Stefan Weil --- .github/workflows/check-merge-conflict.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-merge-conflict.yml b/.github/workflows/check-merge-conflict.yml index f4b27d2af6..e857e90b10 100644 --- a/.github/workflows/check-merge-conflict.yml +++ b/.github/workflows/check-merge-conflict.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check for dirty pull requests - uses: eps1lon/actions-label-merge-conflict@releases/2.x + uses: eps1lon/actions-label-merge-conflict@v3 with: dirtyLabel: "status: conflict" repoToken: "${{ secrets.GITHUB_TOKEN }}" From 4db520095322deed0a79801842d053d9af9f5b06 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 23 Mar 2024 18:30:38 +0100 Subject: [PATCH 5/5] Update GitHub action nick-fields/retry Signed-off-by: Stefan Weil --- .github/workflows/automated-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 121ef277b5..6dea5e8c26 100644 --- a/.github/workflows/automated-tests.yml +++ b/.github/workflows/automated-tests.yml @@ -281,7 +281,7 @@ jobs: npx playwright install ' - name: Run tests - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: timeout_minutes: 25 max_attempts: 3