Skip to content

Commit

Permalink
Handle missing secrets on PR builds from forks
Browse files Browse the repository at this point in the history
- Inject Gradle Enterprise access key via file for jobs run on forks
- Ignore empty build cache credentials
  • Loading branch information
marcphilipp committed Feb 15, 2020
1 parent f82e2f7 commit c702b5f
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 5 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/cross-version.yml
Expand Up @@ -10,7 +10,6 @@ on:
- '*'

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}

Expand All @@ -24,6 +23,10 @@ jobs:
container: "junitteam/build:${{ matrix.jdk }}"
steps:
- uses: actions/checkout@v2
- name: Prepare Gradle Enterprise credentials
run: |
mkdir -p ~/.gradle/enterprise/
echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > ~/.gradle/enterprise/keys.properties
- name: Test
run: |
./gradlew --version
Expand Down
20 changes: 19 additions & 1 deletion .github/workflows/main.yml
Expand Up @@ -10,7 +10,6 @@ on:
- '*'

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
ORG_GRADLE_PROJECT_junitBuildCacheUsername: ${{ secrets.BUILD_CACHE_USERNAME }}
ORG_GRADLE_PROJECT_junitBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}

Expand All @@ -21,6 +20,10 @@ jobs:
container: junitteam/build:latest
steps:
- uses: actions/checkout@v2
- name: Prepare Gradle Enterprise credentials
run: |
mkdir -p ~/.gradle/enterprise/
echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > ~/.gradle/enterprise/keys.properties
- name: 'Test'
run: |
./gradlew --version
Expand All @@ -35,6 +38,11 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 11
- name: Prepare Gradle Enterprise credentials
shell: bash
run: |
mkdir -p ~/.gradle/enterprise/
echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > ~/.gradle/enterprise/keys.properties
- name: 'Test'
shell: bash
run: |
Expand All @@ -50,6 +58,10 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 11
- name: Prepare Gradle Enterprise credentials
run: |
mkdir -p ~/.gradle/enterprise/
echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > ~/.gradle/enterprise/keys.properties
- name: 'Test'
run: |
./gradlew --version
Expand All @@ -66,6 +78,10 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 11
- name: Prepare Gradle Enterprise credentials
run: |
mkdir -p ~/.gradle/enterprise/
echo "${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}" > ~/.gradle/enterprise/keys.properties
- name: 'Run tests with JaCoCo'
shell: bash
run: |
Expand Down Expand Up @@ -93,6 +109,7 @@ jobs:
env:
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
run: ./gradlew --scan publish -x check

update_documentation:
Expand All @@ -109,6 +126,7 @@ jobs:
- name: 'Upload Documentation'
env:
GRGIT_USER: ${{ secrets.GH_TOKEN }}
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
run: |
sudo apt-get install graphviz
./src/publishDocumentationSnapshotOnlyIfNecessary.sh
6 changes: 3 additions & 3 deletions settings.gradle.kts
Expand Up @@ -49,10 +49,10 @@ buildCache {
}
remote<HttpBuildCache> {
url = uri("$gradleEnterpriseServer/cache/")
isPush = isCiServer && junitBuildCacheUsername != null && junitBuildCachePassword != null
isPush = isCiServer && !junitBuildCacheUsername.isNullOrEmpty() && !junitBuildCachePassword.isNullOrEmpty()
credentials {
username = junitBuildCacheUsername
password = junitBuildCachePassword
username = junitBuildCacheUsername?.ifEmpty { null }
password = junitBuildCachePassword?.ifEmpty { null }
}
}
}
Expand Down

0 comments on commit c702b5f

Please sign in to comment.