Skip to content

Sync with instrumentation workflows #2168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2025
Merged

Sync with instrumentation workflows #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions .github/workflows/build-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,25 @@ permissions:
contents: read

jobs:
spotless:
Copy link
Member Author

@trask trask Aug 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this splits spotless out into separate job so if it fails you can still see if the other jobs succeed or fail

probably not that important anymore with the autospotless automation

UPDATE I think it's helpful after all, for people running jobs in their forks (autospotless only runs in this repo)

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

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

- name: Set up Gradle
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
with:
cache-read-only: ${{ inputs.cache-read-only }}

- name: Spotless
run: ./gradlew spotlessCheck ${{ inputs.no-build-cache && '--no-build-cache' || '' }}

build:
runs-on: ubuntu-latest
steps:
Expand All @@ -29,13 +48,13 @@ jobs:
distribution: temurin
java-version: 17

- name: Set up gradle
- name: Set up Gradle
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
with:
cache-read-only: ${{ inputs.cache-read-only }}

- name: Gradle build and test
run: ./gradlew build -x test ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
- name: Build
run: ./gradlew build -x spotlessCheck -x test ${{ inputs.no-build-cache && '--no-build-cache' || '' }}

test:
name: Test
Expand All @@ -44,8 +63,6 @@ jobs:
fail-fast: false
matrix:
os:
- macos-latest
- macos-13
Comment on lines -47 to -48
Copy link
Member Author

@trask trask Aug 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't test macos in instrumentation repo, I think its probably ok not to test in this repo too(?)

- ubuntu-latest
- windows-latest
test-java-version:
Expand All @@ -54,18 +71,6 @@ jobs:
- 17
- 21
- 24 # renovate: datasource=java-version
# macos-latest drops support for java 8 temurin. Run java 8 on macos-13. Run java 11, 17, 21 on macos-latest.
exclude:
- os: macos-latest
test-java-version: 8
- os: macos-13
test-java-version: 11
- os: macos-13
test-java-version: 17
- os: macos-13
test-java-version: 21
- os: macos-13
test-java-version: 24 # renovate: datasource=java-version
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

Expand All @@ -83,12 +88,12 @@ jobs:
distribution: temurin
java-version: 17

- name: Set up gradle
- name: Set up Gradle
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
with:
cache-read-only: ${{ inputs.cache-read-only }}

- name: Gradle test
- name: Test
run: >
./gradlew test
"-PtestJavaVersion=${{ matrix.test-java-version }}"
Expand All @@ -108,7 +113,7 @@ jobs:
distribution: temurin
java-version: 17

- name: Set up gradle
- name: Set up Gradle
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
with:
cache-read-only: ${{ inputs.cache-read-only }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
needs:
- common
runs-on: ubuntu-latest
# skipping release branches because the versions in those branches are not snapshots
if: github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java-contrib'
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: CodeQL

on:
push:
branches:
- main
- release/*
pull_request:
branches:
- main
Expand All @@ -15,6 +11,10 @@ on:
# - https://github.com/github/codeql-action/issues/1537
# - https://github.com/github/codeql-action/issues/2691
# merge_group:
push:
branches:
- main
- release/*
schedule:
- cron: "29 13 * * 2" # weekly at 13:29 UTC on Tuesday

Expand Down
50 changes: 3 additions & 47 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,59 +11,15 @@ permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

- name: Set up JDK for running Gradle
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
with:
distribution: temurin
java-version: 17

- name: Set up gradle
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
- name: Gradle build
run: ./gradlew build

- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
name: Save unit test results
if: always()
with:
name: test-results
path: jmx-metrics/build/reports/tests/test

integration-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

- name: Set up JDK for running Gradle
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
with:
distribution: temurin
java-version: 17

- name: Set up gradle
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
- name: Integration test
run: ./gradlew integrationTest

- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
name: Save integration test results
if: always()
with:
name: integration-test-results
path: jmx-metrics/build/reports/tests/integrationTest
common:
uses: ./.github/workflows/build-common.yml

release:
permissions:
contents: write # for creating the release
runs-on: ubuntu-latest
needs:
- build
- integration-test
- common
outputs:
version: ${{ steps.create-github-release.outputs.version }}
steps:
Expand Down
Loading