From 5200d48985fa26db53f534f847d43e5b72e53511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Fri, 3 May 2024 11:16:50 -0600 Subject: [PATCH 1/3] chore(workflows): upgrade deprecated GH actions --- .github/workflows/build-dmg-universal.yml | 5 +- .github/workflows/cargo.yml | 4 +- .github/workflows/lint-PR-title.yml | 4 +- .github/workflows/ui-test-automation.yml | 104 +++++++++++----------- 4 files changed, 56 insertions(+), 61 deletions(-) diff --git a/.github/workflows/build-dmg-universal.yml b/.github/workflows/build-dmg-universal.yml index d118a3ad1de..bec9c1ad7d5 100644 --- a/.github/workflows/build-dmg-universal.yml +++ b/.github/workflows/build-dmg-universal.yml @@ -17,10 +17,9 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: 1.75.0 - override: true components: rustfmt, clippy - name: Install Dependencies continue-on-error: true @@ -74,7 +73,7 @@ jobs: run: | shasum -a 256 Uplink-Mac-Universal.zip > Uplink-Mac-Universal.zip.sha256.txt - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 env: NODE_OPTIONS: "--max-old-space-size=8192" with: diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index 168b8c8715d..09ae8e751de 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -28,7 +28,7 @@ jobs: - name: Add linter failing label if cargo workflow fails if: failure() - uses: buildsville/add-remove-label@v2.0.0 + uses: buildsville/add-remove-label@v2.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | @@ -37,7 +37,7 @@ jobs: - name: Remove label if exists and job is successful if: success() - uses: buildsville/add-remove-label@v2.0.0 + uses: buildsville/add-remove-label@v2.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | diff --git a/.github/workflows/lint-PR-title.yml b/.github/workflows/lint-PR-title.yml index 6952e3dbcda..35679f236eb 100644 --- a/.github/workflows/lint-PR-title.yml +++ b/.github/workflows/lint-PR-title.yml @@ -30,7 +30,7 @@ jobs: - name: Add invalid PR title label if regex is not matching if: ${{ steps.regex-match.outputs.match == '' }} - uses: buildsville/add-remove-label@v2.0.0 + uses: buildsville/add-remove-label@v2.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | @@ -39,7 +39,7 @@ jobs: - name: Remove label if regex is matching if: ${{ steps.regex-match.outputs.match != '' }} - uses: buildsville/add-remove-label@v2.0.0 + uses: buildsville/add-remove-label@v2.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | diff --git a/.github/workflows/ui-test-automation.yml b/.github/workflows/ui-test-automation.yml index 26b7958c979..30a15d499ef 100644 --- a/.github/workflows/ui-test-automation.yml +++ b/.github/workflows/ui-test-automation.yml @@ -46,10 +46,9 @@ jobs: uses: Swatinem/rust-cache@v2 - name: Install Rust πŸ’Ώ - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: 1.75.0 - override: true components: rustfmt, clippy - name: Run cargo build shuttle on Warp πŸš€ @@ -59,13 +58,13 @@ jobs: run: ./target/release/shuttle --keyfile key.bin --listen-addr /ip4/127.0.0.1/tcp/4444 > peerID.txt & - name: Upload Artifact Peer ID data⬆️ - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: peerID path: peerID.txt - name: Upload Artifact Key File data⬆️ - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: keyfile path: key.bin @@ -78,7 +77,7 @@ jobs: uses: actions/checkout@v4 - name: Download Peer ID file πŸ—³οΈ - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: peerID path: ./warp @@ -116,7 +115,7 @@ jobs: shasum -a 256 Uplink-Mac-Universal.zip > Uplink-Mac-Universal.zip.sha256.txt - name: Upload Artifact ⬆️ - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 env: NODE_OPTIONS: "--max-old-space-size=8192" with: @@ -128,7 +127,7 @@ jobs: - name: Add label if any of build or test jobs failed if: failure() - uses: buildsville/add-remove-label@v2.0.0 + uses: buildsville/add-remove-label@v2.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | @@ -145,7 +144,7 @@ jobs: uses: actions/checkout@v4 - name: Download Peer ID file πŸ—³οΈ - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: peerID path: ./warp @@ -177,14 +176,14 @@ jobs: run: cargo wix --package uplink --no-build --nocapture - name: Upload Executable ⬆️ - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Uplink-Windows path: target/wix/*.msi - name: Add label if any of build or test jobs failed if: failure() - uses: buildsville/add-remove-label@v2.0.0 + uses: buildsville/add-remove-label@v2.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | @@ -215,26 +214,25 @@ jobs: brew install cairo pango - name: Download Key file πŸ—³οΈ - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: keyfile path: ./warp - name: Install Rust πŸ’Ώ - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: 1.75.0 - override: true components: rustfmt, clippy - name: Setup Node.js πŸ”¨ - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "npm" - name: Cache NPM dependencies πŸ”¨ - uses: actions/cache@v3 + uses: actions/cache@v4 id: cache-mac with: path: node_modules @@ -248,7 +246,7 @@ jobs: run: sudo spctl --master-disable - name: Download the MacOS app πŸ—³οΈ - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: app-macos path: ./apps @@ -289,27 +287,27 @@ jobs: - name: Upload Test Report - MacOS CI if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-report-macos-ci path: ./test-report/*.xml - name: Upload Allure Test Results if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-allure-macos-ci path: ./allure-results/ - name: Upload Screenshots for MacOS πŸ“· - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: appium-screenshots-MacOS path: ./test-results - name: Upload Appium Log for MacOS πŸ“· - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: appium-log-macos @@ -317,7 +315,7 @@ jobs: - name: Add label if any of test jobs failed if: failure() - uses: buildsville/add-remove-label@v2.0.0 + uses: buildsville/add-remove-label@v2.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | @@ -348,26 +346,25 @@ jobs: brew install cairo pango - name: Download Key file πŸ—³οΈ - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: keyfile path: ./warp - name: Install Rust πŸ’Ώ - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: 1.75.0 - override: true components: rustfmt, clippy - name: Setup Node.js πŸ”¨ - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "npm" - name: Cache NPM dependencies πŸ”¨ - uses: actions/cache@v3 + uses: actions/cache@v4 id: cache-mac with: path: node_modules @@ -381,7 +378,7 @@ jobs: run: sudo spctl --master-disable - name: Download the MacOS app πŸ—³οΈ - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: app-macos path: ./apps @@ -421,34 +418,34 @@ jobs: - name: Upload Test Report - MacOS Chats if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-report-macos-chats path: ./test-report/*.xml - name: Upload Allure Test Results for MacOS Chats if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-allure-macos-chats path: ./allure-results/ - name: Upload Screenshots for MacOS Chats πŸ“· - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: appium-screenshots-MacOS-chats path: ./test-results - name: Upload Appium Log for MacOS Chats πŸ“· - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: appium-log-macos-chats path: ./appium.log - name: Upload Uplink Logs if test fails πŸ“· - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: uplink-logs @@ -458,7 +455,7 @@ jobs: - name: Add label if any of test jobs failed if: failure() - uses: buildsville/add-remove-label@v2.0.0 + uses: buildsville/add-remove-label@v2.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | @@ -483,16 +480,15 @@ jobs: path: "./warp" - name: Download Key file πŸ—³οΈ - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: keyfile path: ./warp - name: Install Rust πŸ’Ώ - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: 1.75.0 - override: true components: rustfmt, clippy - name: Change resolution on Windows Runner @@ -500,13 +496,13 @@ jobs: shell: powershell - name: Setup Node.js πŸ”¨ - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "npm" - name: Cache NPM dependencies πŸ”¨ - uses: actions/cache@v3 + uses: actions/cache@v4 id: cache-mac with: path: node_modules @@ -517,7 +513,7 @@ jobs: run: npm ci - name: Download the Windows app πŸ—³οΈ - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: Uplink-Windows path: ./apps @@ -563,27 +559,27 @@ jobs: - name: Upload Test Report - Windows CI if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-report-windows-ci path: ./test-report/*.xml - name: Upload Allure Test Results if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-allure-windows-ci path: ./allure-results/ - name: Upload Screenshots for Windows πŸ“· - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: appium-screenshots-windows path: ./test-results - name: Upload Appium Log for Windows πŸ“· - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: appium-log-windows @@ -591,7 +587,7 @@ jobs: - name: Add label if any of test jobs failed if: failure() - uses: buildsville/add-remove-label@v2.0.0 + uses: buildsville/add-remove-label@v2.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | @@ -617,46 +613,46 @@ jobs: steps: - name: Download Test Report for MacOS CI - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: test-report-macos-ci path: artifacts - name: Download Test Report for MacOS Chats - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: test-report-macos-chats path: artifacts - name: Download Test Report for Windows CI - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: test-report-windows-ci path: artifacts - name: Download Allure Results for MacOS CI - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: test-allure-macos-ci path: testing-uplink/allure - name: Download Allure Results for Windows CI - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: test-allure-windows-ci path: testing-uplink/allure - name: Download Allure Results for MacOS Chats - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: test-allure-macos-chats path: testing-uplink/allure - name: Publish Test Results Summary - uses: EnricoMi/publish-unit-test-result-action/composite@v2 + uses: EnricoMi/publish-unit-test-result-action@v2 if: success() with: - junit_files: "artifacts/**/*.xml" + files: "artifacts/**/*.xml" ignore_runs: true job_summary: false compare_to_earlier_commit: false @@ -684,7 +680,7 @@ jobs: - name: Deploy report to Github Pages if: success() - uses: peaceiris/actions-gh-pages@v3 + uses: peaceiris/actions-gh-pages@v4 with: deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} external_repository: Satellite-im/test-reports @@ -732,7 +728,7 @@ jobs: uplink-logs - name: Remove label if all test jobs succeeded - uses: buildsville/add-remove-label@v2.0.0 + uses: buildsville/add-remove-label@v2.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} labels: | From 4409f175648c6188132d31201124cb6cf024216d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Fri, 3 May 2024 11:41:10 -0600 Subject: [PATCH 2/3] chore(workflows): change install rust action --- .github/workflows/build-dmg-universal.yml | 2 +- .github/workflows/ui-test-automation.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-dmg-universal.yml b/.github/workflows/build-dmg-universal.yml index bec9c1ad7d5..8006471a563 100644 --- a/.github/workflows/build-dmg-universal.yml +++ b/.github/workflows/build-dmg-universal.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v4 - name: Install Rust - uses: actions-rust-lang/setup-rust-toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: 1.75.0 components: rustfmt, clippy diff --git a/.github/workflows/ui-test-automation.yml b/.github/workflows/ui-test-automation.yml index 30a15d499ef..71d241d75af 100644 --- a/.github/workflows/ui-test-automation.yml +++ b/.github/workflows/ui-test-automation.yml @@ -46,7 +46,7 @@ jobs: uses: Swatinem/rust-cache@v2 - name: Install Rust πŸ’Ώ - uses: actions-rust-lang/setup-rust-toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: 1.75.0 components: rustfmt, clippy @@ -220,7 +220,7 @@ jobs: path: ./warp - name: Install Rust πŸ’Ώ - uses: actions-rust-lang/setup-rust-toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: 1.75.0 components: rustfmt, clippy @@ -352,7 +352,7 @@ jobs: path: ./warp - name: Install Rust πŸ’Ώ - uses: actions-rust-lang/setup-rust-toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: 1.75.0 components: rustfmt, clippy @@ -486,7 +486,7 @@ jobs: path: ./warp - name: Install Rust πŸ’Ώ - uses: actions-rust-lang/setup-rust-toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: toolchain: 1.75.0 components: rustfmt, clippy From 5d379b9fecaffc3acfa984b8283cd70848a639a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Carden=CC=83a?= <35935591+luisecm@users.noreply.github.com> Date: Mon, 6 May 2024 10:15:56 -0600 Subject: [PATCH 3/3] chore(appium): upgrade ffpmpeg action --- .github/workflows/ui-test-automation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ui-test-automation.yml b/.github/workflows/ui-test-automation.yml index 71d241d75af..fe91fcb0e80 100644 --- a/.github/workflows/ui-test-automation.yml +++ b/.github/workflows/ui-test-automation.yml @@ -537,7 +537,7 @@ jobs: cp -r C:\Program` Files\uplink\extensions\emoji_selector.dll $home/.uplink/extensions - name: Setup FFMPEG to record screen - uses: FedericoCarboni/setup-ffmpeg@v2 + uses: FedericoCarboni/setup-ffmpeg@v3 id: setup-ffmpeg - name: Delete Cache Folder if exists - Windows