Remove GITHUB_TOKEN, build with Gradle configuration (#2796)

* Remove GITHUB_TOKEN, build with gradle configuration * Encode PAT
AlphaWallet · Sep 1, 2022 · d04e1ed · d04e1ed
1 parent 5746c1e
commit d04e1ed
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,8 +18,6 @@ jobs:
           architecture: arm64
 
       - name: Run unit tests
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: sh ./build.sh
 
       - name: Upload Test Reports Folder

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -24,8 +24,6 @@ jobs:
 
       - name: Run tests
         uses: reactivecircus/android-emulator-runner@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           api-level: ${{ matrix.api-level }}
           target: ${{ matrix.target }}

diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml
@@ -4,9 +4,6 @@ jobs:
   lint:
     name: Comments lint result on PR
     runs-on: macos-latest
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
     steps:
       - uses: actions/checkout@v3
       - name: set up JDK

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,9 +8,6 @@ jobs:
   lint:
     name: Run Lint
     runs-on: macos-latest
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK

diff --git a/app/build.gradle b/app/build.gradle
@@ -217,15 +217,15 @@ task printVersionCode {
 gradle.projectsEvaluated({
     def username = getGitHubUsername()
     def password = getPAT()
-    def isOnCI = System.getenv("GITHUB_TOKEN")
-    if (!isOnCI && (!username || !password)) {
+    if (!username || !password) {
         throw new GradleException('Please provide GitHub username and Personal Access Token. Find more here https://github.com/alphaWallet/alpha-wallet-android#getting-started')
     }
 })
 
 // GitHub Personal Access Token
 private String getPAT() {
-    project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
+    def encodedToken = project.findProperty("gpr.key")
+    new String(encodedToken.decodeBase64())
 }
 
 private String getGitHubUsername() {

diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,8 @@ android.useAndroidX=true
 org.gradle.jvmargs=-Xms2048m -Xmx4096m
 android.suppressUnsupportedCompileSdk=32
 
-# You should replace these with your own generated PAT, please see the Readme.md
+# Base64 Encoded GitHub PAT,
+# Make sure only check read:packages and read:user permissions if you want to create your own PAT,
+# and encode it with Base64 encoder https://www.base64encoder.io/
 gpr.user=smarttokenlabs@hotmail.com
-gpr.key=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
+gpr.key=Z2hwX3NFR09PbXRkOFQ2M09RcEdmY0xvR1VXTVJ6ODJBSDAxWWQ4OA==