Skip to content

Commit bb03bcf

Browse files
akarnokdakarnokd
authored
3.x: Action cache clear, limit environmental variables (#7238)
* 3.x: Action cache clear, limit environmental variables * No secrets for PRs
1 parent 5bb119b commit bb03bcf

File tree

5 files changed

+33
-25
lines changed

5 files changed

+33
-25
lines changed

‎.github/workflows/gradle_branch.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
uses: actions/[email protected]
2323
with:
2424
path: ~/.gradle/caches
25-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
26-
restore-keys: ${{ runner.os }}-gradle
25+
key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
26+
restore-keys: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}
2727
- name: Grant execute permission for gradlew
2828
run: chmod +x gradlew
2929
- name: Build branch without snapshot

‎.github/workflows/gradle_jdk11.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
uses: actions/[email protected]
2525
with:
2626
path: ~/.gradle/caches
27-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
28-
restore-keys: ${{ runner.os }}-gradle
27+
key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
28+
restore-keys: ${{ runner.os }}-gradle-1-
2929
- name: Grant execute permission for gradlew
3030
run: chmod +x gradlew
3131
- name: Build PR

‎.github/workflows/gradle_pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
uses: actions/[email protected]
2323
with:
2424
path: ~/.gradle/caches
25-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
26-
restore-keys: ${{ runner.os }}-gradle
25+
key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
26+
restore-keys: ${{ runner.os }}-gradle-1-
2727
- name: Grant execute permission for gradlew
2828
run: chmod +x gradlew
2929
- name: Build PR

‎.github/workflows/gradle_release.yml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ jobs:
1515

1616
runs-on: ubuntu-latest
1717
env:
18-
# Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
19-
# ------------------------------------------------------------------------------
20-
JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}
21-
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_USER }}
22-
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
23-
ORG_GRADLE_PROJECT_SIGNING_PRIVATE_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
24-
ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
25-
# ------------------------------------------------------------------------------
2618
CI_BUILD_NUMBER: ${{ github.run_number }}
2719
steps:
2820
- uses: actions/checkout@v2
@@ -35,8 +27,8 @@ jobs:
3527
uses: actions/[email protected]
3628
with:
3729
path: ~/.gradle/caches
38-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
39-
restore-keys: ${{ runner.os }}-gradle
30+
key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
31+
restore-keys: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}
4032
- name: Grant execute permission for gradlew
4133
run: chmod +x gradlew
4234
- name: Grant execute permission for push
@@ -49,7 +41,18 @@ jobs:
4941
uses: codecov/codecov-action@v1
5042
- name: Upload release
5143
run: ./gradlew -PreleaseMode=full javadocCleanup uploadArchives --no-daemon --no-parallel --stacktrace
44+
env:
45+
# Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
46+
# ------------------------------------------------------------------------------
47+
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_USER }}
48+
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
49+
ORG_GRADLE_PROJECT_SIGNING_PRIVATE_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
50+
ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
5251
- name: Publish release
5352
run: ./gradlew -PreleaseMode=full closeAndReleaseRepository --no-daemon --no-parallel --stacktrace
5453
- name: Push Javadocs
5554
run: ./push_javadoc.sh
55+
env:
56+
# Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
57+
# ------------------------------------------------------------------------------
58+
JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}

‎.github/workflows/gradle_snapshot.yml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@ jobs:
1212

1313
runs-on: ubuntu-latest
1414
env:
15-
# Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
16-
# ------------------------------------------------------------------------------
17-
bintrayUser: ${{ secrets.BINTRAY_USER }}
18-
bintrayKey: ${{ secrets.BINTRAY_KEY }}
19-
sonatypeUsername: ${{ secrets.SONATYPE_USER }}
20-
sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
21-
JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}
2215
# ------------------------------------------------------------------------------
2316
CI_BUILD_NUMBER: ${{ github.run_number }}
2417
steps:
@@ -32,15 +25,27 @@ jobs:
3225
uses: actions/[email protected]
3326
with:
3427
path: ~/.gradle/caches
35-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
36-
restore-keys: ${{ runner.os }}-gradle
28+
key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
29+
restore-keys: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}
3730
- name: Grant execute permission for gradlew
3831
run: chmod +x gradlew
3932
- name: Grant execute permission for push
4033
run: chmod +x push_javadoc.sh
4134
- name: Build and Snapshot branch
4235
run: ./gradlew -PreleaseMode=branch -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace
36+
env:
37+
# Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
38+
# ------------------------------------------------------------------------------
39+
bintrayUser: ${{ secrets.BINTRAY_USER }}
40+
bintrayKey: ${{ secrets.BINTRAY_KEY }}
41+
sonatypeUsername: ${{ secrets.SONATYPE_USER }}
42+
sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
4343
- name: Upload to Codecov
4444
uses: codecov/codecov-action@v1
4545
- name: Push Javadocs
4646
run: ./push_javadoc.sh
47+
# Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
48+
# ------------------------------------------------------------------------------
49+
env:
50+
JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}
51+

0 commit comments

Comments
 (0)