diff --git a/.forgejo/workflows/android-beta.yaml b/.forgejo/workflows/android-beta.yaml index 38460bd37..b7a98a685 100644 --- a/.forgejo/workflows/android-beta.yaml +++ b/.forgejo/workflows/android-beta.yaml @@ -36,15 +36,13 @@ jobs: android-google-beta: name: Android Google Beta runs-on: ubuntu-latest - container: - image: runmymind/docker-android-sdk:latest environment: beta steps: - name: Install build tools and dependencies shell: bash run: | apt-get update -y - apt-get install -y ninja-build + apt-get install -y cmake ninja-build - name: Checkout sources uses: https://github.com/actions/checkout@v4 @@ -71,6 +69,8 @@ jobs: RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }} - name: Compile + container: + image: runmymind/docker-android-sdk:latest shell: bash working-directory: android run: | diff --git a/.forgejo/workflows/android-check.yaml b/.forgejo/workflows/android-check.yaml index 85fc4176e..3d4c592d5 100644 --- a/.forgejo/workflows/android-check.yaml +++ b/.forgejo/workflows/android-check.yaml @@ -38,8 +38,6 @@ jobs: lint: name: Android Lint runs-on: ubuntu-latest - container: - image: runmymind/docker-android-sdk:latest steps: - name: Checkout sources uses: https://github.com/actions/checkout@v4 @@ -51,6 +49,8 @@ jobs: run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20)) - name: Lint + container: + image: runmymind/docker-android-sdk:latest shell: bash working-directory: android run: ./gradlew -Pandroidauto=true lint @@ -79,7 +79,7 @@ jobs: shell: bash run: | apt-get update -y - apt-get install -y ninja-build + apt-get install -y cmake ninja-build - name: Checkout sources uses: https://github.com/actions/checkout@v4 @@ -96,6 +96,8 @@ jobs: key: ${{ github.workflow }}-${{ matrix.flavor }} - name: Compile ${{ matrix.flavor }} + container: + image: runmymind/docker-android-sdk:latest shell: bash working-directory: android env: diff --git a/.forgejo/workflows/android-release.yaml b/.forgejo/workflows/android-release.yaml index d7a14c190..8b92adf63 100644 --- a/.forgejo/workflows/android-release.yaml +++ b/.forgejo/workflows/android-release.yaml @@ -10,8 +10,6 @@ jobs: tag: name: Tag runs-on: ubuntu-latest - container: - image: runmymind/docker-android-sdk:latest environment: production steps: - name: Checkout sources @@ -74,7 +72,7 @@ jobs: shell: bash run: | apt-get update -y - apt-get install -y ninja-build + apt-get install -y cmake ninja-build - name: Checkout sources uses: https://github.com/actions/checkout@v4 @@ -123,6 +121,8 @@ jobs: run: echo "sdk.dir=$ANDROID_SDK_ROOT" > android/local.properties - name: Compile and upload to Google Play + container: + image: runmymind/docker-android-sdk:latest shell: bash working-directory: android run: | @@ -130,6 +130,8 @@ jobs: if: ${{ matrix.flavor == 'google' }} - name: Compile and upload to Huawei AppGallery + container: + image: runmymind/docker-android-sdk:latest shell: bash working-directory: android run: | @@ -138,6 +140,8 @@ jobs: if: ${{ matrix.flavor == 'huawei' }} - name: Compile universal APK + container: + image: runmymind/docker-android-sdk:latest shell: bash working-directory: android run: | diff --git a/.forgejo/workflows/linux-check.yaml b/.forgejo/workflows/linux-check.yaml index 80e13fa65..484f5af40 100644 --- a/.forgejo/workflows/linux-check.yaml +++ b/.forgejo/workflows/linux-check.yaml @@ -53,6 +53,7 @@ jobs: apt update -y apt install -y \ ninja-build \ + cmake \ libgl1-mesa-dev \ libglvnd-dev \ libharfbuzz-dev \