Skip to content

Commit

Permalink
Migrate from burrunan/gradle-cache-action to `gradle/actions/setup-…
Browse files Browse the repository at this point in the history
…gradle` (#1294)

Previous action is not really being updated anymore.

Also remove java grouping for amazon dependabot.
  • Loading branch information
tylerbenson authored May 2, 2024
1 parent ee5e81a commit cc2d9ed
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 15 deletions.
3 changes: 0 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ updates:
opentelemetry-deps-java:
patterns:
- "io.opentelemetry.*"
amazon-deps:
patterns:
- "*amazon*"
java-other:
patterns:
- "*"
Expand Down
20 changes: 15 additions & 5 deletions .github/workflows/ci-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,27 @@ on:
branches:
- main

permissions:
pull-requests: write

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v4
with:
distribution: corretto
java-version: '11'
- uses: burrunan/[email protected]
java-version: 17

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
remote-build-cache-proxy-enabled: false
arguments: build --stacktrace
build-root-directory: java
validate-wrappers: true
add-job-summary-as-pr-comment: on-failure # Valid values are 'never' (default), 'always', and 'on-failure'

- name: Execute Gradle build
run: |
cd java
./gradlew build --scan --stacktrace
17 changes: 10 additions & 7 deletions .github/workflows/release-layer-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,20 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up JDK for running Gradle
uses: actions/setup-java@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
distribution: corretto
java-version: 17

- uses: gradle/gradle-build-action@v3
name: Build Javaagent Layer
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
arguments: :layer-javaagent:assemble
build-root-directory: java
validate-wrappers: true

- name: Execute Gradle build
run: |
cd java
./gradlew :layer-javaagent:assemble --scan --stacktrace
- uses: actions/upload-artifact@v4
name: Save assembled layer to build
Expand Down

0 comments on commit cc2d9ed

Please sign in to comment.