Skip to content

Commit 820eaea

Browse files
authored
Merge branch 'main' into vherremi/VIDtoSHAUpdate
2 parents 7348f91 + 2f83fa2 commit 820eaea

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/post-release-version-bump.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
101101
- name: Update version to next development version in main
102102
run: |
103-
DEV_VERSION="${{ github.event.inputs.version }}.dev0"
103+
DEV_VERSION="${{ github.event.inputs.version }}-SNAPSHOT"
104104
sed -i'' -e "s/val adotVersion = \".*\"/val adotVersion = \"${DEV_VERSION}\"/" version.gradle.kts
105105
VERSION="${{ github.event.inputs.version }}"
106106
sed -i'' -e 's/adot-autoinstrumentation-java:v2.*"/adot-autoinstrumentation-java:v'$VERSION'"/' .github/workflows/daily-scan.yml
@@ -125,7 +125,7 @@ jobs:
125125
env:
126126
GITHUB_TOKEN: ${{ env.BOT_TOKEN_GITHUB_RW_PATOKEN }}
127127
run: |
128-
DEV_VERSION="${{ github.event.inputs.version }}.dev0"
128+
DEV_VERSION="${{ github.event.inputs.version }}-SNAPSHOT"
129129
gh pr create --title "Post release $VERSION: Update version to $DEV_VERSION" \
130130
--body "This PR prepares the main branch for the next development cycle by updating the version to $DEV_VERSION and updating the image version to be scanned to the latest released.
131131

version.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
val adotVersion = "2.18.0-dev0"
16+
val adotVersion = "2.18.0-SNAPSHOT"
1717

1818
allprojects {
1919
version = if (project.hasProperty("release.version")) {

0 commit comments

Comments
 (0)