From bfb1e68894f4a5896b014759e1a8b0dc79bac485 Mon Sep 17 00:00:00 2001 From: Daniel Liao <10663736+liaodaniel@users.noreply.github.com> Date: Wed, 15 May 2024 14:44:48 +1000 Subject: [PATCH 1/7] Rename all vars to map the secret that is shared Signed-off-by: Daniel Liao <10663736+liaodaniel@users.noreply.github.com> --- .github/workflows/codeql.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- README.md | 8 ++++---- settings.gradle | 4 ++-- tyro-pay-android/build.gradle | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 3d3ffa0..905bded 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -52,8 +52,8 @@ jobs: - name: Autobuild uses: github/codeql-action/autobuild@v2 env: - GITHUB_PACKAGES_USER: ${{ github.actor }} - GITHUB_PACKAGES_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_PACKAGE_USER: ${{ github.actor }} + GH_PACKAGE_TOKEN: ${{ secrets.GITHUB_TOKEN }} # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 14343c3..0c9f7b6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,7 +28,7 @@ jobs: - name: Publish aar to GitHub Packages run: ./gradlew publish env: - GITHUB_PACKAGES_USER: ${{github.actor}} - GITHUB_PACKAGES_TOKEN: ${{secrets.GITHUB_TOKEN}} + GH_PACKAGE_USER: ${{github.actor}} + GH_PACKAGE_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eb3ec48..3fa4977 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,8 +63,8 @@ jobs: - name: Publish aar to GitHub Packages run: ./gradlew publish env: - GITHUB_PACKAGES_USER: ${{github.actor}} - GITHUB_PACKAGES_TOKEN: ${{secrets.GITHUB_TOKEN}} + GH_PACKAGE_USER: ${{github.actor}} + GH_PACKAGE_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file diff --git a/README.md b/README.md index 175b35c..709234e 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,13 @@ This SDK supports easy integration of Tyro's Pay API in you Android app. ### Configuration Store GitHub Packages Username -`export GITHUB_PACKAGES_USER={YOUR_GITHUB_USERNAME}` +`export GH_PACKAGE_USER={YOUR_GITHUB_USERNAME}` Setup GitHub Personal Access Token (PAT) * Follow this [GitHub guide](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token-classic) to generate a PAT with `read:packages` permission * Store the new token as an environment variable: -`export GITHUB_PACKAGES_TOKEN={YOUR_GITHUB_TOKEN}` +`export GH_PACKAGE_TOKEN={YOUR_GITHUB_TOKEN}` Add `tyro-pay-api-sdk-android` to your `build.gradle` dependencies. @@ -38,8 +38,8 @@ repositories { maven { url = uri("https://maven.pkg.github.com/tyro/tyro-pay-api-sdk-android") credentials { - username = System.getenv("GITHUB_PACKAGES_USER") - password = System.getenv("GITHUB_PACKAGES_TOKEN") + username = System.getenv("GH_PACKAGE_USER") + password = System.getenv("GH_PACKAGE_TOKEN") } } } diff --git a/settings.gradle b/settings.gradle index b51075c..745ff2d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,8 +17,8 @@ dependencyResolutionManagement { maven { url = uri("https://maven.pkg.github.com/tyro/tyro-pay-api-sdk-android") credentials { - username = System.getenv("GITHUB_PACKAGES_USER") ?: System.getProperty("github.username")?.toString() - password = System.getenv("GITHUB_PACKAGES_TOKEN") + username = System.getenv("GH_PACKAGE_USER") ?: System.getProperty("github.username")?.toString() + password = System.getenv("GH_PACKAGE_TOKEN") } } diff --git a/tyro-pay-android/build.gradle b/tyro-pay-android/build.gradle index b3081a7..e73427d 100644 --- a/tyro-pay-android/build.gradle +++ b/tyro-pay-android/build.gradle @@ -110,8 +110,8 @@ afterEvaluate { name= 'GitHubPackages' url = uri("https://maven.pkg.github.com/tyro/tyro-pay-api-sdk-android") credentials { - username = System.getenv("GITHUB_PACKAGES_USER") - password = System.getenv("GITHUB_PACKAGES_TOKEN") + username = System.getenv("GH_PACKAGE_USER") + password = System.getenv("GH_PACKAGE_TOKEN") } } } From 80c45e22b23428dc82b1d28e7602b95ae8f30390 Mon Sep 17 00:00:00 2001 From: Daniel Liao <10663736+liaodaniel@users.noreply.github.com> Date: Wed, 5 Jun 2024 15:48:20 +1000 Subject: [PATCH 2/7] Point to main branch --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index fe7ff18..f5dcfb9 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -8,7 +8,7 @@ on: jobs: review: - uses: tyro/gh-platform-technology-workflows/.github/workflows/dependency-review.yml@master + uses: tyro/gh-platform-technology-workflows/.github/workflows/dependency-review.yml@main with: build-tool: gradle secrets: inherit From 78d245eccd662e40eb8f9a2d61374f22a7e468d1 Mon Sep 17 00:00:00 2001 From: Daniel Liao <10663736+liaodaniel@users.noreply.github.com> Date: Wed, 5 Jun 2024 17:19:58 +1000 Subject: [PATCH 3/7] Test changes --- .github/workflows/dependency-review.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index f5dcfb9..45b7d5c 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -8,7 +8,8 @@ on: jobs: review: - uses: tyro/gh-platform-technology-workflows/.github/workflows/dependency-review.yml@main + uses: tyro/gh-platform-technology-workflows/.github/workflows/dependency-review.yml@support-module-input with: build-tool: gradle + module: tyro-pay-android secrets: inherit From 3ae56abbdc7340caad4a03ae3175e1aef2f01d3d Mon Sep 17 00:00:00 2001 From: Daniel Liao <10663736+liaodaniel@users.noreply.github.com> Date: Wed, 5 Jun 2024 17:21:53 +1000 Subject: [PATCH 4/7] Update dependency-review.yml --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 45b7d5c..be784e6 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -11,5 +11,5 @@ jobs: uses: tyro/gh-platform-technology-workflows/.github/workflows/dependency-review.yml@support-module-input with: build-tool: gradle - module: tyro-pay-android + gradle-module: tyro-pay-android secrets: inherit From 814e139d5c5f136a9dcbe965fc8654773719eb9c Mon Sep 17 00:00:00 2001 From: Daniel Liao <10663736+liaodaniel@users.noreply.github.com> Date: Thu, 6 Jun 2024 12:22:26 +1000 Subject: [PATCH 5/7] Specify classpath --- .github/workflows/dependency-review.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index be784e6..09392b9 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -12,4 +12,5 @@ jobs: with: build-tool: gradle gradle-module: tyro-pay-android + gradle-configuration: 'releaseRuntimeClasspath' secrets: inherit From ffdd7f142407d2245e4b1399da75d351ddbbdd1b Mon Sep 17 00:00:00 2001 From: Daniel Liao <10663736+liaodaniel@users.noreply.github.com> Date: Fri, 7 Jun 2024 22:19:02 +1000 Subject: [PATCH 6/7] Use Java 11 --- .github/workflows/dependency-review.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 09392b9..b762f80 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -11,6 +11,7 @@ jobs: uses: tyro/gh-platform-technology-workflows/.github/workflows/dependency-review.yml@support-module-input with: build-tool: gradle + java-version: '11' gradle-module: tyro-pay-android gradle-configuration: 'releaseRuntimeClasspath' secrets: inherit From 529421ae01b510b8bee389db42a57f086934798c Mon Sep 17 00:00:00 2001 From: Daniel Liao <10663736+liaodaniel@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:29:00 +1000 Subject: [PATCH 7/7] Point back to main --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index b762f80..d96ae97 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -8,7 +8,7 @@ on: jobs: review: - uses: tyro/gh-platform-technology-workflows/.github/workflows/dependency-review.yml@support-module-input + uses: tyro/gh-platform-technology-workflows/.github/workflows/dependency-review.yml@main with: build-tool: gradle java-version: '11'