From 6ebabbf39d36c1ab59f0755477977a2529e59170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Tue, 14 Apr 2026 15:51:18 -0400 Subject: [PATCH 1/2] Replace local `setup` composite action by shared repo --- .../.github/actions/setup/action.yml | 92 ------------------- .../.github/workflows/mt-download-data.yml | 2 +- .../workflows/mt-record-screenshots.yml | 2 +- .../.github/workflows/mt-release.yml | 2 +- .../workflows/mt-store-listing-pull.yml | 2 +- .../workflows/mt-store-listing-push.yml | 2 +- .../.github/workflows/mt-sync-code-data.yml | 2 +- 7 files changed, 6 insertions(+), 98 deletions(-) delete mode 100644 shared-overwrite/.github/actions/setup/action.yml diff --git a/shared-overwrite/.github/actions/setup/action.yml b/shared-overwrite/.github/actions/setup/action.yml deleted file mode 100644 index 5d77ee69..00000000 --- a/shared-overwrite/.github/actions/setup/action.yml +++ /dev/null @@ -1,92 +0,0 @@ -# ORIGINAL FILE: https://github.com/mtransitapps/commons/tree/master/shared-overwrite -name: MT setup -description: 'Setup workspace (git submodules/branches & gradle)' -inputs: - code-sync: - description: "Sync code from submodules before setup." - type: boolean - default: false - required: false -# TODO outputs? - -runs: - using: "composite" - steps: - - - name: MT check out submodules - shell: bash - run: ./checkout_submodules.sh - - - name: MT check out all git submodule closest branch - if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' - shell: bash - run: | - echo "[MT] > Checking out submodules closest branch, '$MT_BRANCH_NAME' or '$MT_TARGET_BRANCH_NAME' or '$MT_DEFAULT_BRANCH_NAME':" - git submodule foreach 'git checkout $MT_BRANCH_NAME || git checkout $MT_TARGET_BRANCH_NAME || git checkout $MT_DEFAULT_BRANCH_NAME' - echo "[MT] > Showing submodules current branch:" - git submodule foreach 'git branch --show-current' - - - name: MT checkout this repo PR branch to allow push commits - if: env.MT_IS_AGENCY_REPO == 'true' && (github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch') - shell: bash - run: | - echo "[MT] > Checking out this repo closest branch, '$MT_BRANCH_NAME' or '$MT_TARGET_BRANCH_NAME':" - git checkout $MT_BRANCH_NAME || git checkout $MT_TARGET_BRANCH_NAME - echo "[MT] > Showing this repo current branch:" - git branch --show-current - - - name: MT check out this submodule repo build SHA - if: env.MT_IS_SUBMODULE == 'true' - shell: bash - run: | - REPOSITORY_OWNER_AND_NAME=${{ github.repository }}; - REPOSITORY_NAME=$(basename $REPOSITORY_OWNER_AND_NAME); - echo "[MT] > Checking out this repo '$REPOSITORY_NAME' workflow sha '$MT_SHA':" - git -C $REPOSITORY_NAME checkout $MT_SHA; - - - name: MT setup MT_GIT_BRANCH env - if: github.repository == 'mtransitapps/mtransit-for-android' || github.event_name != 'pull_request' - shell: bash - run: | - # MT_GIT_BRANCH=${GITHUB_REF##*/}" - MT_GIT_BRANCH=${{ github.head_ref || github.ref_name }} - echo "[MT] > setup MT_GIT_BRANCH='$MT_GIT_BRANCH'." - # echo "MT_GIT_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV - echo "MT_GIT_BRANCH=$MT_GIT_BRANCH" >> $GITHUB_ENV - - - name: MT install apt dependencies - shell: bash - run: | - max_attempts=2 - for attempt in $(seq 1 ${max_attempts}); do - echo "[MT] > Installing apt dependencies (attempt ${attempt}/${max_attempts})..." - # can not use '--no-install-recommends' because some of those recommended dependencies are required - if timeout 5m sudo apt-get update && timeout 10m sudo apt-get install -y libxml2-utils jq inkscape imagemagick; then - echo "[MT] > apt dependencies installed successfully." - break - elif [[ ${attempt} -lt ${max_attempts} ]]; then - echo "[MT] > apt dependencies installation failed or timed out, retrying in 20 seconds..." - sleep 20 - else - echo "[MT] > apt dependencies installation failed after ${attempt} attempts." - exit 1 - fi - done - - - name: MT code sync - shell: bash - if: ${{ inputs.code-sync == 'true' }} - run: ./commons/code_sync.sh - - - name: MT code setup - shell: bash - run: ./commons/code_setup.sh - - - name: MT set up JDK 17 - uses: actions/setup-java@v5 - with: - distribution: 'temurin' - java-version: '17' - - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v5 diff --git a/shared-overwrite/.github/workflows/mt-download-data.yml b/shared-overwrite/.github/workflows/mt-download-data.yml index 2f850e09..8a70c98b 100644 --- a/shared-overwrite/.github/workflows/mt-download-data.yml +++ b/shared-overwrite/.github/workflows/mt-download-data.yml @@ -55,7 +55,7 @@ jobs: - name: MT setup if: steps.check-input-url.outputs.has_input_url == 'true' id: mt-setup - uses: ./.github/actions/setup + uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.0 with: code-sync: ${{ github.ref == format('refs/heads/{0}', env.MT_DEFAULT_BRANCH_NAME) }} diff --git a/shared-overwrite/.github/workflows/mt-record-screenshots.yml b/shared-overwrite/.github/workflows/mt-record-screenshots.yml index 301fa82c..4e06c9c1 100644 --- a/shared-overwrite/.github/workflows/mt-record-screenshots.yml +++ b/shared-overwrite/.github/workflows/mt-record-screenshots.yml @@ -52,7 +52,7 @@ jobs: token: ${{ secrets.MT_PAT }} - name: MT setup - uses: ./.github/actions/setup + uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.0 - name: MT read sdk-target from gradle/libs.versions.toml id: sdk-target diff --git a/shared-overwrite/.github/workflows/mt-release.yml b/shared-overwrite/.github/workflows/mt-release.yml index 5d0fc23b..d04e58a9 100644 --- a/shared-overwrite/.github/workflows/mt-release.yml +++ b/shared-overwrite/.github/workflows/mt-release.yml @@ -90,7 +90,7 @@ jobs: - name: MT setup id: mt-setup - uses: ./.github/actions/setup + uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.0 - name: MT enable app release run: | diff --git a/shared-overwrite/.github/workflows/mt-store-listing-pull.yml b/shared-overwrite/.github/workflows/mt-store-listing-pull.yml index 4569afe4..c3f01252 100644 --- a/shared-overwrite/.github/workflows/mt-store-listing-pull.yml +++ b/shared-overwrite/.github/workflows/mt-store-listing-pull.yml @@ -39,7 +39,7 @@ jobs: token: ${{ secrets.MT_PAT }} - name: MT setup - uses: ./.github/actions/setup + uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.0 - name: MT pull store listings env: diff --git a/shared-overwrite/.github/workflows/mt-store-listing-push.yml b/shared-overwrite/.github/workflows/mt-store-listing-push.yml index 7bbf0c02..ade037aa 100644 --- a/shared-overwrite/.github/workflows/mt-store-listing-push.yml +++ b/shared-overwrite/.github/workflows/mt-store-listing-push.yml @@ -51,7 +51,7 @@ jobs: - name: MT setup id: mt-setup - uses: ./.github/actions/setup + uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.0 - name: MT push store listing run: ./app-android/listing_push.sh diff --git a/shared-overwrite/.github/workflows/mt-sync-code-data.yml b/shared-overwrite/.github/workflows/mt-sync-code-data.yml index edd0b2a0..4ee21737 100644 --- a/shared-overwrite/.github/workflows/mt-sync-code-data.yml +++ b/shared-overwrite/.github/workflows/mt-sync-code-data.yml @@ -96,7 +96,7 @@ jobs: - name: MT setup id: mt-setup - uses: ./.github/actions/setup + uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.0 with: code-sync: ${{ github.ref == format('refs/heads/{0}', env.MT_DEFAULT_BRANCH_NAME) }} From c97df6b0f371578126be64c719ea7914a6e27dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Tue, 14 Apr 2026 15:59:03 -0400 Subject: [PATCH 2/2] wip --- .github/dependabot.yml | 1 + shared-overwrite/.github/workflows/mt-download-data.yml | 2 +- shared-overwrite/.github/workflows/mt-record-screenshots.yml | 2 +- shared-overwrite/.github/workflows/mt-release.yml | 2 +- shared-overwrite/.github/workflows/mt-store-listing-pull.yml | 2 +- shared-overwrite/.github/workflows/mt-store-listing-push.yml | 2 +- shared-overwrite/.github/workflows/mt-sync-code-data.yml | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 86b25e2d..2aee6f0c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,6 +9,7 @@ updates: - package-ecosystem: "github-actions" directories: - "/" + - "/shared-overwrite/.github/actions/" - "/shared-overwrite/.github/workflows/" schedule: interval: "weekly" diff --git a/shared-overwrite/.github/workflows/mt-download-data.yml b/shared-overwrite/.github/workflows/mt-download-data.yml index 8a70c98b..f7001a2a 100644 --- a/shared-overwrite/.github/workflows/mt-download-data.yml +++ b/shared-overwrite/.github/workflows/mt-download-data.yml @@ -55,7 +55,7 @@ jobs: - name: MT setup if: steps.check-input-url.outputs.has_input_url == 'true' id: mt-setup - uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.0 + uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.1 with: code-sync: ${{ github.ref == format('refs/heads/{0}', env.MT_DEFAULT_BRANCH_NAME) }} diff --git a/shared-overwrite/.github/workflows/mt-record-screenshots.yml b/shared-overwrite/.github/workflows/mt-record-screenshots.yml index 4e06c9c1..c2243574 100644 --- a/shared-overwrite/.github/workflows/mt-record-screenshots.yml +++ b/shared-overwrite/.github/workflows/mt-record-screenshots.yml @@ -52,7 +52,7 @@ jobs: token: ${{ secrets.MT_PAT }} - name: MT setup - uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.0 + uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.1 - name: MT read sdk-target from gradle/libs.versions.toml id: sdk-target diff --git a/shared-overwrite/.github/workflows/mt-release.yml b/shared-overwrite/.github/workflows/mt-release.yml index d04e58a9..41a7b799 100644 --- a/shared-overwrite/.github/workflows/mt-release.yml +++ b/shared-overwrite/.github/workflows/mt-release.yml @@ -90,7 +90,7 @@ jobs: - name: MT setup id: mt-setup - uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.0 + uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.1 - name: MT enable app release run: | diff --git a/shared-overwrite/.github/workflows/mt-store-listing-pull.yml b/shared-overwrite/.github/workflows/mt-store-listing-pull.yml index c3f01252..6010112c 100644 --- a/shared-overwrite/.github/workflows/mt-store-listing-pull.yml +++ b/shared-overwrite/.github/workflows/mt-store-listing-pull.yml @@ -39,7 +39,7 @@ jobs: token: ${{ secrets.MT_PAT }} - name: MT setup - uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.0 + uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.1 - name: MT pull store listings env: diff --git a/shared-overwrite/.github/workflows/mt-store-listing-push.yml b/shared-overwrite/.github/workflows/mt-store-listing-push.yml index ade037aa..9ee6b01b 100644 --- a/shared-overwrite/.github/workflows/mt-store-listing-push.yml +++ b/shared-overwrite/.github/workflows/mt-store-listing-push.yml @@ -51,7 +51,7 @@ jobs: - name: MT setup id: mt-setup - uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.0 + uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.1 - name: MT push store listing run: ./app-android/listing_push.sh diff --git a/shared-overwrite/.github/workflows/mt-sync-code-data.yml b/shared-overwrite/.github/workflows/mt-sync-code-data.yml index 4ee21737..21decd0a 100644 --- a/shared-overwrite/.github/workflows/mt-sync-code-data.yml +++ b/shared-overwrite/.github/workflows/mt-sync-code-data.yml @@ -96,7 +96,7 @@ jobs: - name: MT setup id: mt-setup - uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.0 + uses: mtransitapps/gh-actions/.github/actions/setup@v1.0.1 with: code-sync: ${{ github.ref == format('refs/heads/{0}', env.MT_DEFAULT_BRANCH_NAME) }}