Skip to content

Commit a42f4c6

Browse files
author
Paul Rybitskyi
authored
Improve CI scripts (#50)
1 parent 6754fab commit a42f4c6

File tree

5 files changed

+41
-155
lines changed

5 files changed

+41
-155
lines changed

‎.github/ci-gradle.properties‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎.github/workflows/build.yml‎

Lines changed: 25 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
pull_request:
77
branches: [ master ]
88

9+
env:
10+
JDK_JAVA_DISTRIBUTION: 'temurin'
11+
JDK_JAVA_VERSION: '17'
12+
913
jobs:
1014
static-analysis:
1115
name: Static Analysis
@@ -14,30 +18,16 @@ jobs:
1418

1519
steps:
1620
- name: Checkout Repo
17-
uses: actions/checkout@v2
21+
uses: actions/checkout@v4
1822

19-
- name: Set up JDK 17
20-
uses: actions/setup-java@v2
23+
- name: Set up JDK
24+
uses: actions/setup-java@v4
2125
with:
22-
distribution: 'temurin'
23-
java-version: '17'
24-
25-
- name: Generate a Cache Key
26-
run: ./checksum.sh checksum.txt
26+
distribution: ${{ env.JDK_JAVA_DISTRIBUTION }}
27+
java-version: ${{ env.JDK_JAVA_VERSION }}
2728

28-
- name: Copy CI Gradle Properties
29-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
30-
31-
- name: Cache Gradle Folders
32-
uses: actions/cache@v2
33-
with:
34-
path: |
35-
~/.gradle/caches/
36-
~/.gradle/wrapper/
37-
key: cache-gradle-${{ runner.os }}-${{ hashFiles('checksum.txt') }}
38-
restore-keys: |
39-
cache-gradle-${{ runner.os }}-
40-
cache-gradle-
29+
- name: Set up Gradle
30+
uses: gradle/actions/setup-gradle@v4
4131

4232
- name: Run Static Analysis Tools
4333
run: ./gradlew lint --continue
@@ -48,30 +38,16 @@ jobs:
4838

4939
steps:
5040
- name: Checkout Repo
51-
uses: actions/checkout@v2
41+
uses: actions/checkout@v4
5242

53-
- name: Set up JDK 17
54-
uses: actions/setup-java@v2
43+
- name: Set up JDK
44+
uses: actions/setup-java@v4
5545
with:
56-
distribution: 'temurin'
57-
java-version: '17'
58-
59-
- name: Generate a Cache Key
60-
run: ./checksum.sh checksum.txt
46+
distribution: ${{ env.JDK_JAVA_DISTRIBUTION }}
47+
java-version: ${{ env.JDK_JAVA_VERSION }}
6148

62-
- name: Copy CI Gradle Properties
63-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
64-
65-
- name: Cache Gradle Folders
66-
uses: actions/cache@v2
67-
with:
68-
path: |
69-
~/.gradle/caches/
70-
~/.gradle/wrapper/
71-
key: cache-gradle-${{ runner.os }}-${{ hashFiles('checksum.txt') }}
72-
restore-keys: |
73-
cache-gradle-${{ runner.os }}-
74-
cache-gradle-
49+
- name: Set up Gradle
50+
uses: gradle/actions/setup-gradle@v4
7551

7652
- name: Run Unit Tests
7753
run: ./gradlew test
@@ -82,30 +58,16 @@ jobs:
8258

8359
steps:
8460
- name: Checkout Repo
85-
uses: actions/checkout@v2
61+
uses: actions/checkout@v4
8662

87-
- name: Set up JDK 17
88-
uses: actions/setup-java@v2
63+
- name: Set up JDK
64+
uses: actions/setup-java@v4
8965
with:
90-
distribution: 'temurin'
91-
java-version: '17'
92-
93-
- name: Generate a Cache Key
94-
run: ./checksum.sh checksum.txt
66+
distribution: ${{ env.JDK_JAVA_DISTRIBUTION }}
67+
java-version: ${{ env.JDK_JAVA_VERSION }}
9568

96-
- name: Copy CI Gradle Properties
97-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
98-
99-
- name: Cache Gradle Folders
100-
uses: actions/cache@v2
101-
with:
102-
path: |
103-
~/.gradle/caches/
104-
~/.gradle/wrapper/
105-
key: cache-gradle-${{ runner.os }}-${{ hashFiles('checksum.txt') }}
106-
restore-keys: |
107-
cache-gradle-${{ runner.os }}-
108-
cache-gradle-
69+
- name: Set up Gradle
70+
uses: gradle/actions/setup-gradle@v4
10971

11072
- name: Build Debug APK
11173
run: ./gradlew assembleDebug

‎.github/workflows/gradle-wrapper-validation.yml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.github/workflows/release.yml‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,37 @@ on:
55
tags:
66
- 'v*'
77

8+
env:
9+
JDK_JAVA_DISTRIBUTION: 'temurin'
10+
JDK_JAVA_VERSION: '17'
11+
812
jobs:
913
release:
14+
name: Create a GitHub Release
1015
runs-on: [ubuntu-latest]
16+
permissions:
17+
contents: write
1118

1219
steps:
1320
- name: Checkout Repo
14-
uses: actions/checkout@v2
21+
uses: actions/checkout@v4
1522

16-
- name: Set up JDK 17
17-
uses: actions/setup-java@v2
23+
- name: Set up JDK
24+
uses: actions/setup-java@v4
1825
with:
19-
distribution: 'temurin'
20-
java-version: '17'
21-
22-
- name: Generate a Cache Key
23-
run: ./checksum.sh checksum.txt
26+
distribution: ${{ env.JDK_JAVA_DISTRIBUTION }}
27+
java-version: ${{ env.JDK_JAVA_VERSION }}
2428

25-
- name: Copy CI Gradle Properties
26-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
27-
28-
- name: Cache Gradle Folders
29-
uses: actions/cache@v2
30-
with:
31-
path: |
32-
~/.gradle/caches/
33-
~/.gradle/wrapper/
34-
key: cache-gradle-${{ runner.os }}-${{ hashFiles('checksum.txt') }}
35-
restore-keys: |
36-
cache-gradle-${{ runner.os }}-
37-
cache-gradle-
29+
- name: Set up Gradle
30+
uses: gradle/actions/setup-gradle@v4
3831

3932
- name: Build Debug APK
4033
run: ./gradlew assembleDebug
4134

4235
- name: Create GitHub Release
43-
uses: softprops/action-gh-release@v1
44-
env:
45-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36+
uses: softprops/action-gh-release@v2
4637
with:
47-
tag_name: ${{ github.ref }}
48-
release_name: Release ${{ github.ref }}
38+
name: Release ${{ github.ref }}
4939
draft: true
5040
prerelease: false
5141
files: app/build/outputs/apk/debug/sample-debug.apk

‎checksum.sh‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)