Skip to content

Commit e2dacb8

Browse files
this-Adityathis-Aditya
authored
Merge pull request #490 from RADAR-base/release-1.4.2
Update GitHub Actions
2 parents 4a701c5 + 62da9e7 commit e2dacb8

File tree

9 files changed

+147
-110
lines changed

9 files changed

+147
-110
lines changed

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,33 @@
1-
# Continuous integration, including test and integration test
21
name: CI
32

4-
# Run in master and dev branches and in all pull requests to those branches
53
on:
64
push:
75
branches: [ master, dev ]
86
pull_request:
97
branches: [ master, dev ]
108

11-
env:
12-
DOCKER_IMAGE: radarbase/radar-output-restructure
13-
149
jobs:
15-
# Build and test the code
1610
build:
17-
# The type of runner that the job will run on
1811
runs-on: ubuntu-latest
1912

20-
# Steps represent a sequence of tasks that will be executed as part of the job
2113
steps:
22-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
23-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v5
2415

25-
- uses: actions/setup-java@v3
16+
- uses: actions/setup-java@v5
2617
with:
27-
java-version: 17
2818
distribution: temurin
19+
java-version: 17
2920

30-
- uses: gradle/gradle-build-action@v2
21+
- name: Setup Gradle
22+
uses: gradle/actions/setup-gradle@v3
3123

3224
- name: Decrypt libraries
3325
run: ./.github/scripts/decrypt_libraries.sh
3426
env:
3527
E4LINK_PASSPHRASE: ${{ secrets.E4LINK_PASSPHRASE }}
3628

37-
# Compile the code
3829
- name: Compile code
3930
run: ./gradlew assembleDebug
4031

41-
# Gradle check
4232
- name: Check
4333
run: ./gradlew testDebugUnitTest lintDebug

.github/workflows/publish_snapshots.yml renamed to .github/workflows/publish-snapshots.yml

File renamed without changes.

‎.github/workflows/release.yml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,37 @@
1-
# Create release files
21
name: Release
32

43
on:
54
release:
65
types: [published]
76

8-
env:
9-
DOCKER_IMAGE: radarbase/radar-output-restructure
10-
117
jobs:
128
upload:
13-
# The type of runner that the job will run on
149
runs-on: ubuntu-latest
10+
permissions:
11+
contents: read
12+
packages: write
1513

16-
# Steps represent a sequence of tasks that will be executed as part of the job
1714
steps:
18-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
19-
- uses: actions/checkout@v3
20-
- uses: actions/setup-java@v3
15+
- uses: actions/checkout@v5
16+
17+
- uses: actions/setup-java@v5
2118
with:
2219
distribution: temurin
2320
java-version: 17
2421

25-
- uses: gradle/gradle-build-action@v2
22+
- name: Setup Gradle
23+
uses: gradle/actions/setup-gradle@v3
2624

2725
- name: Decrypt libraries
2826
run: ./.github/scripts/decrypt_libraries.sh
2927
env:
3028
E4LINK_PASSPHRASE: ${{ secrets.E4LINK_PASSPHRASE }}
3129

32-
# Compile code
3330
- name: Compile code
3431
run: ./gradlew assembleRelease
3532

36-
# Upload it to GitHub
3733
- name: Upload to GitHub
38-
uses: AButler/upload-release-assets@v2.0
34+
uses: AButler/upload-release-assets@v3.0
3935
with:
4036
files: '*/build/outputs/aar/*;plugins/*/build/outputs/aar/*'
4137
repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -47,6 +43,6 @@ jobs:
4743
4844
- name: Publish
4945
env:
50-
OSSRH_USER: ${{ secrets.OSSRH_USER }}
51-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
46+
OSSRH_USER: ${{ secrets.OSSRH_USER_TOKEN_ID }}
47+
OSSRH_PASSWORD: ${{ secrets.OSSRH_USER_TOKEN_SECRET }}
5248
run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_NAME }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish closeAndReleaseSonatypeStagingRepository

‎.github/workflows/scheduled-snyk.yaml‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
name: Snyk scheduled test
2+
3+
on:
4+
schedule:
5+
- cron: '0 2 * * 1'
6+
push:
7+
branches:
8+
- master
9+
workflow_dispatch:
10+
11+
env:
12+
MODULES: >-
13+
[{
14+
'name': 'radar-commons-android',
15+
'build_file': 'radar-commons-android/build.gradle',
16+
},{
17+
'name': 'avro-android',
18+
'build_file': 'avro-android/build.gradle',
19+
},{
20+
'name': 'radar-android-empatica',
21+
'build_file': 'plugins/radar-android-empatica/build.gradle',
22+
},{
23+
'name': 'radar-android-faros',
24+
'build_file': 'plugins/radar-android-faros/build.gradle',
25+
},{
26+
'name': 'radar-android-application-status',
27+
'build_file': 'plugins/radar-android-application-status/build.gradle',
28+
},{
29+
'name': 'radar-android-audio',
30+
'build_file': 'plugins/radar-android-audio/build.gradle',
31+
},{
32+
'name': 'radar-android-google-activity',
33+
'build_file': 'plugins/radar-android-google-activity/build.gradle',
34+
},{
35+
'name': 'radar-android-google-places',
36+
'build_file': 'plugins/radar-android-google-places/build.gradle',
37+
},{
38+
'name': 'radar-android-google-sleep',
39+
'build_file': 'plugins/radar-android-google-sleep/build.gradle',
40+
},{
41+
'name': 'radar-android-login-oauth2',
42+
'build_file': 'plugins/radar-android-login-oauth2/build.gradle',
43+
},{
44+
'name': 'radar-android-login-qr',
45+
'build_file': 'plugins/radar-android-login-qr/build.gradle',
46+
},{
47+
'name': 'radar-android-phone',
48+
'build_file': 'plugins/radar-android-phone/build.gradle',
49+
},{
50+
'name': 'radar-android-phone-audio-input',
51+
'build_file': 'plugins/radar-android-phone-audio-input/build.gradle',
52+
},{
53+
'name': 'radar-android-phone-telephony',
54+
'build_file': 'plugins/radar-android-phone-telephony/build.gradle',
55+
},{
56+
'name': 'radar-android-phone-usage',
57+
'build_file': 'plugins/radar-android-phone-usage/build.gradle',
58+
},{
59+
'name': 'radar-android-polar',
60+
'build_file': 'plugins/radar-android-polar/build.gradle',
61+
},{
62+
'name': 'radar-android-weather',
63+
'build_file': 'plugins/radar-android-weather/build.gradle',
64+
}]
65+
66+
jobs:
67+
prepare-matrix:
68+
name: Prepare Matrix Output
69+
runs-on: ubuntu-latest
70+
permissions: {}
71+
outputs:
72+
modules: ${{ steps.step1.outputs.matrix }}
73+
steps:
74+
- name: Create Matrix Variable
75+
id: step1
76+
run: echo "matrix=${{env.MODULES}}" >> $GITHUB_OUTPUT
77+
78+
security:
79+
needs: prepare-matrix
80+
runs-on: ubuntu-latest
81+
permissions:
82+
contents: read
83+
security-events: write
84+
strategy:
85+
matrix:
86+
module: ${{ fromJson(needs.prepare-matrix.outputs.modules ) }}
87+
88+
steps:
89+
- uses: actions/checkout@v5
90+
91+
- name: Decrypt libraries
92+
run: ./.github/scripts/decrypt_libraries.sh
93+
env:
94+
E4LINK_PASSPHRASE: ${{ secrets.E4LINK_PASSPHRASE }}
95+
96+
- name: Run Snyk to check for vulnerabilities
97+
uses: snyk/actions/gradle-8-jdk17@master
98+
continue-on-error: true # To make sure that SARIF upload gets called
99+
env:
100+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
101+
with:
102+
args: >-
103+
--file=${{ matrix.module.build_file }}
104+
--configuration-matching='^runtimeClasspath$'
105+
--fail-on=upgradable
106+
--severity-threshold=high
107+
--policy-path=.snyk
108+
--org=radar-base
109+
--sarif-file-output=snyk.sarif
110+
111+
# Detected vulnerabilities will appear on Github in Security->Code_scanning_alerts tab
112+
- name: Upload result to GitHub Code Scanning
113+
uses: github/codeql-action/upload-sarif@v3
114+
with:
115+
sarif_file: snyk.sarif
116+
category: ${{ matrix.module.module }}

‎.github/workflows/scheduled_snyk.yaml‎

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

‎.github/workflows/snyk.yaml‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Snyk test
2+
23
on:
34
pull_request:
45
branches:
@@ -8,33 +9,24 @@ on:
89
jobs:
910
security:
1011
runs-on: ubuntu-latest
11-
steps:
12-
- uses: actions/checkout@v3
13-
- uses: snyk/actions/setup@master
14-
with:
15-
snyk-version: v1.1032.0
1612

17-
- uses: actions/setup-java@v3
18-
with:
19-
distribution: temurin
20-
java-version: 17
13+
steps:
14+
- uses: actions/checkout@v5
2115

2216
- name: Decrypt libraries
2317
run: ./.github/scripts/decrypt_libraries.sh
2418
env:
2519
E4LINK_PASSPHRASE: ${{ secrets.E4LINK_PASSPHRASE }}
2620

27-
- name: Setup Gradle
28-
uses: gradle/gradle-build-action@v2
29-
3021
- name: Run Snyk to check for vulnerabilities
22+
uses: snyk/actions/gradle-8-jdk17@master
3123
env:
3224
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
33-
run: >
34-
snyk test
35-
--all-sub-projects
36-
--configuration-matching="^runtimeClasspath$"
37-
--fail-on=upgradable
38-
--org=radar-base
39-
--policy-path=.snyk
40-
--severity-threshold=high
25+
with:
26+
args: >-
27+
--all-projects
28+
--configuration-matching="^runtimeClasspath$"
29+
--severity-threshold=high
30+
--fail-on=upgradable
31+
--org=radar-base
32+
--policy-path=.snyk

‎.snyk‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,4 @@
22
version: v1.931.0
33
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
44
ignore:
5-
SNYK-JAVA-ORGJETBRAINSKOTLIN-2393744:
6-
- '*':
7-
reason: Not using createTempFile/Dir
8-
expires: 2023-10-27T10:04:03.174Z
9-
created: 2022-06-27T10:04:03.177Z
105
patch: {}

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ android.defaults.buildfeatures.buildconfig=true
2424
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
2525
# org.gradle.parallel=true
2626

27-
project_version=1.4.1-SNAPSHOT
27+
project_version=1.4.1
2828

2929
java_version=17
3030
kotlin_version=1.9.23
31-
gradle_version=8.7
31+
gradle_version=8.13
3232

3333
gradle_android_version=8.2.0
3434
unmock_plugin_version=0.7.9

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)