Improve CI scripts

mars885 · Aug 18, 2024 · 94b9199 · 94b9199
1 parent 6754fab
commit 94b9199
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 155 deletions.
diff --git a/.github/ci-gradle.properties b/.github/ci-gradle.properties
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  JDK_JAVA_DISTRIBUTION: 'temurin'
+  JDK_JAVA_VERSION: '17'
+
 jobs:
   static-analysis:
     name: Static Analysis
@@ -14,30 +18,16 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: Generate a Cache Key
-        run: ./checksum.sh checksum.txt
+          distribution: ${{ env.JDK_JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JDK_JAVA_VERSION }}
 
-      - name: Copy CI Gradle Properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Cache Gradle Folders
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches/
-            ~/.gradle/wrapper/
-          key: cache-gradle-${{ runner.os }}-${{ hashFiles('checksum.txt') }}
-          restore-keys: |
-            cache-gradle-${{ runner.os }}-
-            cache-gradle-
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Run Static Analysis Tools
         run: ./gradlew lint --continue
@@ -48,30 +38,16 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: Generate a Cache Key
-        run: ./checksum.sh checksum.txt
+          distribution: ${{ env.JDK_JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JDK_JAVA_VERSION }}
 
-      - name: Copy CI Gradle Properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Cache Gradle Folders
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches/
-            ~/.gradle/wrapper/
-          key: cache-gradle-${{ runner.os }}-${{ hashFiles('checksum.txt') }}
-          restore-keys: |
-            cache-gradle-${{ runner.os }}-
-            cache-gradle-
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Run Unit Tests
         run: ./gradlew test
@@ -82,30 +58,16 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: Generate a Cache Key
-        run: ./checksum.sh checksum.txt
+          distribution: ${{ env.JDK_JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JDK_JAVA_VERSION }}
 
-      - name: Copy CI Gradle Properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Cache Gradle Folders
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches/
-            ~/.gradle/wrapper/
-          key: cache-gradle-${{ runner.os }}-${{ hashFiles('checksum.txt') }}
-          restore-keys: |
-            cache-gradle-${{ runner.os }}-
-            cache-gradle-
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build Debug APK
         run: ./gradlew assembleDebug
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,47 +5,37 @@ on:
     tags:
       - 'v*'
 
+env:
+  JDK_JAVA_DISTRIBUTION: 'temurin'
+  JDK_JAVA_VERSION: '17'
+
 jobs:
   release:
+    name: Create a GitHub Release
     runs-on: [ubuntu-latest]
+    permissions:
+      contents: write
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: Generate a Cache Key
-        run: ./checksum.sh checksum.txt
+          distribution: ${{ env.JDK_JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JDK_JAVA_VERSION }}
 
-      - name: Copy CI Gradle Properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Cache Gradle Folders
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches/
-            ~/.gradle/wrapper/
-          key: cache-gradle-${{ runner.os }}-${{ hashFiles('checksum.txt') }}
-          restore-keys: |
-            cache-gradle-${{ runner.os }}-
-            cache-gradle-
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build Debug APK
         run: ./gradlew assembleDebug
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
+          name: Release ${{ github.ref }}
           draft: true
           prerelease: false
           files: app/build/outputs/apk/debug/sample-debug.apk
diff --git a/checksum.sh b/checksum.sh