From 7ce43a0afdaae565e52073e3c49abae938f60d4d Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Sat, 16 Mar 2024 13:00:48 +0100 Subject: [PATCH] Update build pipeline to resolve deprecation warnings --- .github/workflows/build-app-workflow.yaml | 14 +++++++------- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/crowdin.yml | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-app-workflow.yaml b/.github/workflows/build-app-workflow.yaml index 21704ce8..d3c55f8e 100644 --- a/.github/workflows/build-app-workflow.yaml +++ b/.github/workflows/build-app-workflow.yaml @@ -5,17 +5,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 - - uses: actions/setup-java@v3 + uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 + - uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' cache: 'gradle' - name: Build the app run: ./gradlew build - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: apk path: app/build/outputs/apk/debug/app-debug.apk @@ -23,8 +23,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' @@ -54,7 +54,7 @@ jobs: cp -r app/build/reports/androidTests/connected/* artifacts/report/ if adb shell '[ -e /sdcard/Pictures/screenshots ]'; then adb pull /sdcard/Pictures/screenshots artifacts/; fi test ! -f tests_failing - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: instrumented-test-report diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0d3d0dc0..d4570016 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -16,7 +16,7 @@ jobs: security-events: write steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Exclude paths # The importers are excluded from analysis, because some of the apps Aegis # can import from don't have such great crypto, which will cause false @@ -24,18 +24,18 @@ jobs: run: | find app/src/main/java/com/beemdevelopment/aegis/importers ! \( -name AegisImporter.java -o -name "DatabaseImporter*" \) -type f -exec rm -f {} + sed -i '/Importer.class/d' app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' cache: 'gradle' - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: java - name: Build run: ./gradlew assembleDebug - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index 6b9cb779..e0fd559c 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest if: github.repository == 'beemdevelopment/Aegis' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install crowdin-cli run: | wget https://github.com/crowdin/crowdin-cli/releases/download/3.7.2/crowdin-cli.zip