diff --git a/.forgejo/workflows/android-beta.yaml b/.forgejo/workflows/android-beta.yaml index e200fcd68..5a592b2e3 100644 --- a/.forgejo/workflows/android-beta.yaml +++ b/.forgejo/workflows/android-beta.yaml @@ -32,13 +32,12 @@ on: - track_generator/** - xcode/** -env: - JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64 # Java 17 is required for Android Gradle 8 plugin - 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 diff --git a/.forgejo/workflows/android-check-metadata.yaml b/.forgejo/workflows/android-check-metadata.yaml index a0da1c5de..9572fdd68 100644 --- a/.forgejo/workflows/android-check-metadata.yaml +++ b/.forgejo/workflows/android-check-metadata.yaml @@ -11,7 +11,7 @@ on: jobs: android-check-metadata: name: Check app metadata - runs-on: ubuntu-latest + runs-on: codeberg-tiny steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.forgejo/workflows/android-check.yaml b/.forgejo/workflows/android-check.yaml index 766445fe1..b533cca3d 100644 --- a/.forgejo/workflows/android-check.yaml +++ b/.forgejo/workflows/android-check.yaml @@ -34,13 +34,12 @@ on: - track_generator/** - xcode/** -env: - JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64 # Java 17 is required for Android Gradle 8 plugin - jobs: lint: name: Android Lint - runs-on: ubuntu-latest + runs-on: codeberg-tiny + container: + image: runmymind/docker-android-sdk:latest steps: - name: Checkout sources uses: actions/checkout@v4 @@ -59,6 +58,8 @@ jobs: android-check: name: Build Android Debug runs-on: ubuntu-latest + container: + image: runmymind/docker-android-sdk:latest strategy: fail-fast: false matrix: diff --git a/.forgejo/workflows/android-monkey.yaml b/.forgejo/workflows/android-monkey.yaml index ad68a78ee..ffc76fb9b 100644 --- a/.forgejo/workflows/android-monkey.yaml +++ b/.forgejo/workflows/android-monkey.yaml @@ -4,12 +4,9 @@ on: schedule: - cron: '0 5 * * 0' # Once per week at 05:00 UTC -env: - JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64 # Java 17 is required for Android Gradle 8 plugin - jobs: precondition: - runs-on: ubuntu-latest + runs-on: codeberg-tiny name: Check preconditions steps: - name: Checkout sources @@ -34,6 +31,8 @@ jobs: android-google-beta: name: Android Google Beta runs-on: ubuntu-latest + container: + image: runmymind/docker-android-sdk:latest needs: precondition if: ${{ needs.precondition.outputs.updated != '' }} environment: beta diff --git a/.forgejo/workflows/android-release-metadata.yaml b/.forgejo/workflows/android-release-metadata.yaml index 460cade7b..83ccb697a 100644 --- a/.forgejo/workflows/android-release-metadata.yaml +++ b/.forgejo/workflows/android-release-metadata.yaml @@ -2,13 +2,12 @@ name: Android Release Metadata on: workflow_dispatch: # Manual trigger -env: - JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64 # Java 17 is required for Android Gradle 8 plugin - jobs: android-release-metadata: name: Upload Google Play metadata - runs-on: ubuntu-latest + runs-on: codeberg-tiny + container: + image: runmymind/docker-android-sdk:latest environment: production steps: - name: Checkout sources diff --git a/.forgejo/workflows/android-release.yaml b/.forgejo/workflows/android-release.yaml index 51d1417c7..36273d6af 100644 --- a/.forgejo/workflows/android-release.yaml +++ b/.forgejo/workflows/android-release.yaml @@ -5,12 +5,13 @@ on: env: RELEASE_NOTES: android/app/src/google/play/release-notes/en-US/default.txt FDROID_VERSION: android/app/src/fdroid/play/version.yaml - JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64 # Java 17 is required for Android Gradle 8 plugin jobs: tag: name: Tag runs-on: ubuntu-latest + container: + image: runmymind/docker-android-sdk:latest environment: production steps: - name: Checkout sources diff --git a/.forgejo/workflows/appstream-check.yaml b/.forgejo/workflows/appstream-check.yaml index 5bd0d9bfb..1b422ff34 100644 --- a/.forgejo/workflows/appstream-check.yaml +++ b/.forgejo/workflows/appstream-check.yaml @@ -3,20 +3,20 @@ on: workflow_dispatch: # Manual trigger pull_request: paths: - - packaging/app.organicmaps.desktop.metainfo.xml + - packaging/app.comaps.desktop.metainfo.xml - .forgejo/workflows/appstream-check.yaml # Run check on self change jobs: validate-appstream: name: Validate appstream metadata xml - runs-on: ubuntu-24.04 + runs-on: codeberg-tiny steps: - name: Checkout sources uses: actions/checkout@v4 with: fetch-depth: 1 sparse-checkout: | - packaging/app.organicmaps.desktop.metainfo.xml + packaging/app.comaps.desktop.metainfo.xml - name: Install appstream validator and flatpak Builder shell: bash @@ -29,8 +29,8 @@ jobs: - name: Lint appstream data with flatpak Builder shell: bash - run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.organicmaps.desktop.metainfo.xml + run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.desktop.metainfo.xml - name: Run appstreamcli in pedantic mode shell: bash - run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.organicmaps.desktop.metainfo.xml + run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.desktop.metainfo.xml diff --git a/.forgejo/workflows/coverage-check.yaml b/.forgejo/workflows/coverage-check.yaml index b7cc3b7a4..1cdc94882 100644 --- a/.forgejo/workflows/coverage-check.yaml +++ b/.forgejo/workflows/coverage-check.yaml @@ -33,7 +33,7 @@ concurrency: jobs: should-run-check: name: Should run coverage - runs-on: ubuntu-24.04 + runs-on: codeberg-tiny outputs: run-from-pr: ${{ steps.run-from-pr.outputs.run-from-pr }} manually-triggered: ${{ steps.manually-triggered.outputs.manually-triggered }} @@ -59,14 +59,9 @@ jobs: coverage: needs: should-run-check name: Generate coverage report - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest if: ${{ needs.should-run-check.outputs.run-from-pr == 'true' || needs.should-run-check.outputs.manually-triggered == 'true'}} steps: - - name: Free disk space by removing .NET, Android and Haskell - shell: bash - run: | - sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc - - name: Checkout sources uses: actions/checkout@v4 with: diff --git a/.forgejo/workflows/desktop-file-check.yaml b/.forgejo/workflows/desktop-file-check.yaml index 006ef8981..9f795d18d 100644 --- a/.forgejo/workflows/desktop-file-check.yaml +++ b/.forgejo/workflows/desktop-file-check.yaml @@ -3,20 +3,20 @@ on: workflow_dispatch: # Manual trigger pull_request: paths: - - qt/res/app.organicmaps.desktop.desktop + - qt/res/app.comaps.desktop.desktop - .forgejo/workflows/desktop-file-check.yaml # Run check on self change jobs: validate-desktop-file: name: Validate .desktop file - runs-on: ubuntu-24.04 + runs-on: codeberg-tiny steps: - name: Checkout sources uses: actions/checkout@v4 with: fetch-depth: 1 sparse-checkout: | - qt/res/app.organicmaps.desktop.desktop + qt/res/app.comaps.desktop.desktop - name: Install desktop-file-validate tool shell: bash @@ -27,4 +27,4 @@ jobs: - name: Validate desktop file shell: bash - run: desktop-file-validate qt/res/app.organicmaps.desktop.desktop && echo "Successfully validated .desktop file" + run: desktop-file-validate qt/res/app.comaps.desktop.desktop && echo "Successfully validated .desktop file" diff --git a/.forgejo/workflows/ios-check-metadata.yaml b/.forgejo/workflows/ios-check-metadata.yaml index 768839292..43558492c 100644 --- a/.forgejo/workflows/ios-check-metadata.yaml +++ b/.forgejo/workflows/ios-check-metadata.yaml @@ -10,7 +10,7 @@ on: jobs: ios-check-metadata: name: Check app metadata - runs-on: ubuntu-latest + runs-on: codeberg-tiny steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.forgejo/workflows/linux-check.yaml b/.forgejo/workflows/linux-check.yaml index ce6954bdc..ee76ec45a 100644 --- a/.forgejo/workflows/linux-check.yaml +++ b/.forgejo/workflows/linux-check.yaml @@ -31,18 +31,13 @@ on: jobs: linux-no-unity: name: Linux no unity build - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest # Cancels previous jobs if the same branch or PR was updated again. concurrency: group: ${{ github.workflow }}-no-unity-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true steps: - - name: Free disk space by removing .NET, Android and Haskell - shell: bash - run: | - sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc - - name: Checkout sources uses: actions/checkout@v4 with: @@ -95,7 +90,7 @@ jobs: linux-matrix: name: Linux builds and tests - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -107,11 +102,6 @@ jobs: cancel-in-progress: true steps: - - name: Free disk space by removing .NET, Android and Haskell - shell: bash - run: | - sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc - - name: Checkout sources uses: actions/checkout@v4