Skip to content
Merged
4 changes: 4 additions & 0 deletions .github/workflows/auto-update-semconv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
already-opened: ${{ steps.check-versions.outputs.already-opened }}
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false

- id: check-versions
name: Check versions
Expand Down Expand Up @@ -63,6 +65,8 @@ jobs:
with:
# using custom token so the changelog PR link update push triggers workflows
token: ${{ steps.otelbot-token.outputs.token }}
# zizmor: ignore[artipacked] App credentials are required by the branch pushes below.
persist-credentials: true

- name: Update version
env:
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/build-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ jobs:

steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false

- id: setup-java-test
name: Set up Java ${{ matrix.test-java-version }} for tests
Expand All @@ -74,13 +76,16 @@ jobs:
- uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0

- name: build
shell: bash
run: >
./gradlew
build
-PtestJavaVersion=${{ matrix.test-java-version }}
"-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }},${{ steps.setup-java.outputs.path }}"
"-Porg.gradle.java.installations.paths=${STEPS_SETUP_JAVA_TEST_OUTPUTS_PATH},${STEPS_SETUP_JAVA_OUTPUTS_PATH}"
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
STEPS_SETUP_JAVA_TEST_OUTPUTS_PATH: ${{ steps.setup-java-test.outputs.path }}
STEPS_SETUP_JAVA_OUTPUTS_PATH: ${{ steps.setup-java.outputs.path }}
Comment thread
opentelemetrybot marked this conversation as resolved.
Comment thread
opentelemetrybot marked this conversation as resolved.
- name: generate
# Skip running on macos-latest which doesn't have docker
if: matrix.os == 'ubuntu-latest'
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false

- name: Set up Java 21
if: matrix.language == 'java'
Expand All @@ -38,8 +40,9 @@ jobs:
distribution: temurin
java-version: 21

# This workflow analyzes release branches but does not build or publish release artifacts.
- name: Set up gradle # zizmor: ignore[cache-poisoning]
- name: Set up gradle
# zizmor: ignore[cache-poisoning] This workflow analyzes release branches
# but does not build or publish release artifacts.
if: matrix.language == 'java'
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false

- uses: fossas/fossa-action@29693cc50323968e039056be419b32989fc5880c # v2.0.0
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false

# this needs to be in its own workflow in order to make OSSF scorecard happy
- uses: gradle/actions/wrapper-validation@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
2 changes: 2 additions & 0 deletions .github/workflows/issue-management-feedback-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false

- name: Remove labels
env:
Expand Down
25 changes: 17 additions & 8 deletions .github/workflows/prepare-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false

- name: Verify prerequisites
run: |
Expand All @@ -35,6 +37,8 @@ jobs:
# history is needed to allow fast-forward push below in case
# re-running this workflow after merging additional PRs to main
fetch-depth: 0
# zizmor: ignore[artipacked] Credentials are required by the branch pushes below.
persist-credentials: true
Comment thread
opentelemetrybot marked this conversation as resolved.

- name: Create release branch
run: |
Expand Down Expand Up @@ -71,7 +75,7 @@ jobs:

- name: Create pull request against the release branch
env:
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
# pull requests from secrets.GITHUB_TOKEN do not run workflows
GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
run: |
message="Prepare release $VERSION"
Expand All @@ -80,9 +84,10 @@ jobs:
git checkout -b $branch
git commit -a -m "$message"
git push --set-upstream origin $branch
gh pr create --title "[$RELEASE_BRANCH_NAME] $message" \
--body "$message." \
--base $RELEASE_BRANCH_NAME
gh pr create \
--title "[$RELEASE_BRANCH_NAME] $message" \
--body "$message." \
--base $RELEASE_BRANCH_NAME

create-pull-request-against-main:
permissions:
Expand All @@ -92,6 +97,9 @@ jobs:
- prereqs
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
# zizmor: ignore[artipacked] Credentials are required by the branch push below.
persist-credentials: true
Comment thread
opentelemetrybot marked this conversation as resolved.

- name: Set environment variables
run: |
Expand Down Expand Up @@ -120,7 +128,7 @@ jobs:

- name: Create pull request against main
env:
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
# pull requests from secrets.GITHUB_TOKEN do not run workflows
GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
run: |
message="Update changelog for $VERSION release"
Expand All @@ -130,6 +138,7 @@ jobs:
git checkout -b $branch
git commit -a -m "$message"
git push --set-upstream origin $branch
gh pr create --title "$message" \
--body "$body" \
--base main
gh pr create \
--title "$message" \
--body "$body" \
--base main
17 changes: 13 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:
fi

- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false

- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
with:
Expand Down Expand Up @@ -76,6 +78,7 @@ jobs:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
ref: main
persist-credentials: false

- name: Check that change log update was merged to main
run: |
Expand All @@ -89,6 +92,7 @@ jobs:
with:
# tags are needed for the generate-release-contributors.sh script
fetch-depth: 0
persist-credentials: false

- name: Generate release notes
env:
Expand Down Expand Up @@ -138,6 +142,8 @@ jobs:
# add change log sync (if any) into this PR since the apidiff update
# is required before any other PR can be merged anyway
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false
Comment thread
opentelemetrybot marked this conversation as resolved.
Comment thread
opentelemetrybot marked this conversation as resolved.

- name: Copy change log section from release branch
env:
Expand All @@ -149,6 +155,8 @@ jobs:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
ref: main
# zizmor: ignore[artipacked] Credentials are required by the branch push below.
persist-credentials: true
Comment thread
opentelemetrybot marked this conversation as resolved.

- name: Merge change log to main
env:
Expand Down Expand Up @@ -207,7 +215,7 @@ jobs:
- name: Create pull request against main
env:
VERSION: ${{ needs.release.outputs.version }}
# not using secrets.GITHUB_TOKEN since pull requests from that token do not run workflows
# pull requests from secrets.GITHUB_TOKEN do not run workflows
GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
run: |
message="Update apidiff baseline to released version $VERSION"
Expand All @@ -217,6 +225,7 @@ jobs:
git checkout -b $branch
git commit -m "$message"
git push --set-upstream origin $branch
Comment thread
opentelemetrybot marked this conversation as resolved.
gh pr create --title "$message" \
--body "$body" \
--base main
gh pr create \
--title "$message" \
--body "$body" \
--base main
Comment thread
opentelemetrybot marked this conversation as resolved.
1 change: 1 addition & 0 deletions .github/workflows/reusable-lint-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
fetch-depth: 0 # needed for merge-base used in modified-files mode
persist-credentials: false

- uses: jdx/mise-action@e6a8b3978addb5a52f2b4cd9d91eafa7f0ab959d # v4.2.0

Expand Down
Loading