From f34ecd7f61be578167597001839710581f6dba7c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 18 Mar 2026 03:01:41 +0000 Subject: [PATCH 1/6] Initial plan From e2d1bd33aab528d1738a28bf5abc2588db5298da Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 18 Mar 2026 03:05:12 +0000 Subject: [PATCH 2/6] Add mt-push-store-listing workflow Co-authored-by: mmathieum <177998+mmathieum@users.noreply.github.com> --- .../workflows/mt-push-store-listing.yml | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 shared-overwrite/.github/workflows/mt-push-store-listing.yml diff --git a/shared-overwrite/.github/workflows/mt-push-store-listing.yml b/shared-overwrite/.github/workflows/mt-push-store-listing.yml new file mode 100644 index 00000000..62b796c5 --- /dev/null +++ b/shared-overwrite/.github/workflows/mt-push-store-listing.yml @@ -0,0 +1,62 @@ +# ORIGINAL FILE: https://github.com/mtransitapps/commons/tree/master/shared-overwrite +name: MT push store listing +on: + push: + branches: + - master + paths: + - 'app-android/src/main/play/listings/**' + workflow_dispatch: # manual + inputs: + allowNonDefault: + description: 'Allow running on non-default branch' + type: boolean + default: false + required: false +# gh workflow run mt-push-store-listing.yml +# gh workflow run mt-push-store-listing.yml --ref $(git rev-parse --abbrev-ref HEAD) -f allowNonDefault=true +# gh run list --workflow=mt-push-store-listing.yml +# gh run watch ; gh browse --branch $(git rev-parse --abbrev-ref HEAD) +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +env: + # git branches & sha + MT_SHA: ${{ github.event.pull_request.head.sha || github.sha }} + MT_BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + MT_TARGET_BRANCH_NAME: ${{ github.base_ref || github.ref_name }} + MT_DEFAULT_BRANCH_NAME: ${{ github.event.repository.default_branch }} + # repo type + MT_IS_SUBMODULE: ${{ contains(fromJSON('["mtransitapps/commons", "mtransitapps/commons-java", "mtransitapps/parser", "mtransitapps/commons-android"]'), github.repository) }} + MT_IS_MAIN_REPO: ${{ endsWith(github.repository, '/mtransit-for-android') }} + MT_IS_AGENCY_REPO: ${{ ! contains(fromJSON('["mtransitapps/commons", "mtransitapps/commons-java", "mtransitapps/parser", "mtransitapps/commons-android"]'), github.repository) && ! endsWith(github.repository, '/mtransit-for-android')}} + MT_IS_AGENCY_RDS: ${{ ! contains(github.repository, '-bike-') }} + MT_IS_AGENCY_BIKE: ${{ contains(github.repository, '-bike-') }} + # push to store + MT_ORG_PUSH_STORE_ON: ${{ secrets.MT_ORG_PUSH_STORE_ON }} + MT_ORG_PUSH_STORE_OFF: ${{ secrets.MT_ORG_PUSH_STORE_OFF }} + MT_PUSH_STORE_ON: ${{ secrets.MT_PUSH_STORE_ON }} + MT_PUSH_STORE_OFF: ${{ secrets.MT_PUSH_STORE_OFF }} +jobs: + MT-PUSH-STORE-LISTING-JOB: + if: ${{ github.ref_name == github.event.repository.default_branch || github.event.inputs.allowNonDefault == 'true' }} + name: "MT Push Store Listing" + timeout-minutes: 20 + runs-on: ubuntu-latest + steps: + - name: MT check out main repository code (with submodules) + uses: actions/checkout@v6 + with: + submodules: true # required to set right token + token: ${{ secrets.MT_PAT }} + fetch-depth: 0 # fetch all + + - name: MT setup + id: mt-setup + uses: ./.github/actions/setup + + - name: MT push store listing + run: ./app-android/listing_push.sh + env: + GITHUB_TOKEN: ${{ secrets.MT_PAT }} + MT_ENCRYPT_KEY: ${{ secrets.MT_ENCRYPT_KEY }} From 005b5eae68ec8a3cf075ffd49697f8b4a726bf4d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 18 Mar 2026 12:23:27 +0000 Subject: [PATCH 3/6] Rename workflow to mt-store-listing-push.yml, remove fetch-depth Co-authored-by: mmathieum <177998+mmathieum@users.noreply.github.com> --- ...-store-listing.yml => mt-store-listing-push.yml} | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) rename shared-overwrite/.github/workflows/{mt-push-store-listing.yml => mt-store-listing-push.yml} (89%) diff --git a/shared-overwrite/.github/workflows/mt-push-store-listing.yml b/shared-overwrite/.github/workflows/mt-store-listing-push.yml similarity index 89% rename from shared-overwrite/.github/workflows/mt-push-store-listing.yml rename to shared-overwrite/.github/workflows/mt-store-listing-push.yml index 62b796c5..7f989e31 100644 --- a/shared-overwrite/.github/workflows/mt-push-store-listing.yml +++ b/shared-overwrite/.github/workflows/mt-store-listing-push.yml @@ -1,5 +1,5 @@ # ORIGINAL FILE: https://github.com/mtransitapps/commons/tree/master/shared-overwrite -name: MT push store listing +name: MT store listing > push on: push: branches: @@ -13,9 +13,9 @@ on: type: boolean default: false required: false -# gh workflow run mt-push-store-listing.yml -# gh workflow run mt-push-store-listing.yml --ref $(git rev-parse --abbrev-ref HEAD) -f allowNonDefault=true -# gh run list --workflow=mt-push-store-listing.yml +# gh workflow run mt-store-listing-push.yml +# gh workflow run mt-store-listing-push.yml --ref $(git rev-parse --abbrev-ref HEAD) -f allowNonDefault=true +# gh run list --workflow=mt-store-listing-push.yml # gh run watch ; gh browse --branch $(git rev-parse --abbrev-ref HEAD) concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -38,9 +38,9 @@ env: MT_PUSH_STORE_ON: ${{ secrets.MT_PUSH_STORE_ON }} MT_PUSH_STORE_OFF: ${{ secrets.MT_PUSH_STORE_OFF }} jobs: - MT-PUSH-STORE-LISTING-JOB: + MT-STORE-LISTING-PUSH-JOB: if: ${{ github.ref_name == github.event.repository.default_branch || github.event.inputs.allowNonDefault == 'true' }} - name: "MT Push Store Listing" + name: "MT Store Listing > Push" timeout-minutes: 20 runs-on: ubuntu-latest steps: @@ -49,7 +49,6 @@ jobs: with: submodules: true # required to set right token token: ${{ secrets.MT_PAT }} - fetch-depth: 0 # fetch all - name: MT setup id: mt-setup From 116072a96605ba7ac7ab20f87c628ddccc5b2dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Thu, 19 Mar 2026 11:15:35 -0400 Subject: [PATCH 4/6] listing push >> --no-commit --- shared/app-android/listing_push.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shared/app-android/listing_push.sh b/shared/app-android/listing_push.sh index 50b78545..48fe6910 100755 --- a/shared/app-android/listing_push.sh +++ b/shared/app-android/listing_push.sh @@ -13,7 +13,8 @@ checkResult $?; setGradleArgs; -${SCRIPT_DIR}/../gradlew :app-android:publishListing; # no ${GRADLE_ARGS} for release +# ${SCRIPT_DIR}/../gradlew :app-android:publishListing; # no ${GRADLE_ARGS} for release +${SCRIPT_DIR}/../gradlew :app-android:publishListing --no-commit; # DEBUG # no ${GRADLE_ARGS} for release COMMAND_RESULT=$?; # save command result but cleanup keys 1st ${SCRIPT_DIR}/keys_cleanup.sh; From 3b1179e06311500b6137177fdee6f25ce3fd1102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Thu, 19 Mar 2026 11:21:03 -0400 Subject: [PATCH 5/6] cleanup --- shared-overwrite/.github/workflows/mt-store-listing-push.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shared-overwrite/.github/workflows/mt-store-listing-push.yml b/shared-overwrite/.github/workflows/mt-store-listing-push.yml index 7f989e31..7bbf0c02 100644 --- a/shared-overwrite/.github/workflows/mt-store-listing-push.yml +++ b/shared-overwrite/.github/workflows/mt-store-listing-push.yml @@ -44,10 +44,9 @@ jobs: timeout-minutes: 20 runs-on: ubuntu-latest steps: - - name: MT check out main repository code (with submodules) + - name: MT check out main repository code uses: actions/checkout@v6 with: - submodules: true # required to set right token token: ${{ secrets.MT_PAT }} - name: MT setup From d05ae6e26883ef614cce40a53964edee7f542d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Thu, 19 Mar 2026 11:22:41 -0400 Subject: [PATCH 6/6] re-enable --- shared/app-android/listing_push.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/app-android/listing_push.sh b/shared/app-android/listing_push.sh index 48fe6910..bc0c8b6e 100755 --- a/shared/app-android/listing_push.sh +++ b/shared/app-android/listing_push.sh @@ -13,8 +13,8 @@ checkResult $?; setGradleArgs; -# ${SCRIPT_DIR}/../gradlew :app-android:publishListing; # no ${GRADLE_ARGS} for release -${SCRIPT_DIR}/../gradlew :app-android:publishListing --no-commit; # DEBUG # no ${GRADLE_ARGS} for release +${SCRIPT_DIR}/../gradlew :app-android:publishListing; # no ${GRADLE_ARGS} for release +# ${SCRIPT_DIR}/../gradlew :app-android:publishListing --no-commit; # DEBUG # no ${GRADLE_ARGS} for release COMMAND_RESULT=$?; # save command result but cleanup keys 1st ${SCRIPT_DIR}/keys_cleanup.sh;