From d623eeff26e27b00cd052fef625e66bf4bee4692 Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Fri, 5 Nov 2021 04:24:52 +0100 Subject: [PATCH 1/4] Add spellchecking capabilities for strings.xml to Makefile & CI/CD, by @gsantner (cherry picked from commit ac08c4f75b275c576670f0af74c1c4b4a3432e47) Conflicts: Makefile --- .github/workflows/build-android-project.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-android-project.yml b/.github/workflows/build-android-project.yml index 07923101..a0842cc9 100644 --- a/.github/workflows/build-android-project.yml +++ b/.github/workflows/build-android-project.yml @@ -24,7 +24,6 @@ jobs: - name: "Checkout: Code" uses: actions/checkout@v2 - - name: "Checkout: Code (PR)" uses: actions/checkout@v2 if: "contains(github.event_name, 'pull_request')" @@ -37,6 +36,9 @@ jobs: with: java-version: 1.8 + - name: "Setup: Install additional dependencies" + run: sudo apt-get install -y ispell + - name: "Cache: Gradle" uses: actions/cache@v2 with: From 1a1385301b4200e7f9357ca37a7a1925765d23e8 Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Sun, 19 May 2024 10:12:58 +0200 Subject: [PATCH 2/4] CI/CD: Update GitHub Actions versions, fixes outdated warnings, force Java from Eclipse (cherry picked from commit 9b308928467cf9c1b65f8397a8873c2c7e845433) Conflicts: .github/workflows/build-android-project.yml --- .github/workflows/build-android-project.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-android-project.yml b/.github/workflows/build-android-project.yml index a0842cc9..71140831 100644 --- a/.github/workflows/build-android-project.yml +++ b/.github/workflows/build-android-project.yml @@ -21,18 +21,15 @@ jobs: runs-on: ubuntu-latest steps: - - name: "Checkout: Code" - uses: actions/checkout@v2 - - name: "Checkout: Code (PR)" - uses: actions/checkout@v2 + uses: actions/checkout@v4 if: "contains(github.event_name, 'pull_request')" with: ref: ${{github.event.pull_request.head.ref}} repository: ${{github.event.pull_request.head.repo.full_name}} - name: "Setup: Java" - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 1.8 @@ -40,7 +37,7 @@ jobs: run: sudo apt-get install -y ispell - name: "Cache: Gradle" - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.gradle From 8c8fac9eaf6ea9d1150af220bcf0eac6009d89c5 Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Mon, 16 Sep 2024 23:57:03 +0200 Subject: [PATCH 3/4] GitHub Actions CI configuration - upgrade upload step, fixes CI build error (PR #2416 by @gsantner) (cherry picked from commit ea066b6ac90328a73e7bc1c19078663c66208ef4) --- .github/workflows/build-android-project.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-android-project.yml b/.github/workflows/build-android-project.yml index 71140831..943e9e93 100644 --- a/.github/workflows/build-android-project.yml +++ b/.github/workflows/build-android-project.yml @@ -53,14 +53,14 @@ jobs: - name: "Artifacts: All" if: always() - uses: actions/upload-artifact@v2.2.1 + uses: actions/upload-artifact@v4 with: name: "all" path: dist retention-days: 5 - name: "Artifacts: Android APK" - uses: actions/upload-artifact@v2.2.1 + uses: actions/upload-artifact@v4 with: name: "android-apk" path: | From 05d210ae7608cdcc1451ed08a800fa913bc01495 Mon Sep 17 00:00:00 2001 From: James Addison Date: Tue, 20 May 2025 12:50:03 +0100 Subject: [PATCH 4/4] ci: attempt to use Java 8 LTS from `temurin` --- .github/workflows/build-android-project.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-android-project.yml b/.github/workflows/build-android-project.yml index 943e9e93..8c7bb4f2 100644 --- a/.github/workflows/build-android-project.yml +++ b/.github/workflows/build-android-project.yml @@ -31,7 +31,8 @@ jobs: - name: "Setup: Java" uses: actions/setup-java@v4 with: - java-version: 1.8 + java-version: 8 + distribution: temurin - name: "Setup: Install additional dependencies" run: sudo apt-get install -y ispell