Skip to content

Release patch #1255

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 5 commits into from
Oct 31, 2025
Merged

Release patch #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
436f19b
fix version.gradle.kts logic
ezhang6811 Oct 31, 2025
aab7a40
copy release build to new workflow
ezhang6811 Oct 31, 2025
2792fe4
remove docker publish step
ezhang6811 Oct 31, 2025
4bf0bdc
delete release workflow copy
ezhang6811 Oct 31, 2025
070ac07
comment out docker publish step in release workflow
ezhang6811 Oct 31, 2025
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
20 changes: 10 additions & 10 deletions .github/workflows/release-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,16 +205,16 @@ jobs:
shell: bash
run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "$VERSION"

- name: Build and push image
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0
with:
push: true
build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
context: .
platforms: linux/amd64,linux/arm64
tags: |
${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }}
${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }}
# - name: Build and push image
# uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0
# with:
# push: true
# build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
# context: .
# platforms: linux/amd64,linux/arm64
# tags: |
# ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }}
# ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }}

- name: Build and Publish release with Gradle
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 #v3.5.0
Expand Down
6 changes: 2 additions & 4 deletions version.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
val adotVersion = "2.20.0"

allprojects {
version = if (project.hasProperty("release.version")) {
project.property("release.version") as String
} else {
adotVersion
if (!project.hasProperty("release.version")) {
version = adotVersion
}
}
Loading