Skip to content

Commit

Permalink
chore: update build and tooling to utilize new java version
Browse files Browse the repository at this point in the history
Signed-off-by: Simon Schrottner <[email protected]>
  • Loading branch information
aepfli committed Feb 12, 2025
1 parent 3691b52 commit 632948c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
- name: Set up JDK 8
- name: Set up JDK 17
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
with:
java-version: '17'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
on:
push:
branches:
- beta/new_java_build
- main
name: Run Release Please
permissions: # added using https://github.com/step-security/secure-workflows
contents: read
Expand All @@ -23,7 +23,7 @@ jobs:
id: release
with:
token: ${{secrets.GITHUB_TOKEN}}
target-branch: beta/new_java_build
target-branch: main

# These steps are only run if this was a merged release-please PR
- name: checkout
Expand Down
2 changes: 0 additions & 2 deletions release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"include-component-in-tag": false,
"bump-minor-pre-major": true,
"bump-patch-for-minor-pre-major": true,
"versioning": "prerelease",
"prerelease-type": "beta",
"extra-files": [
"pom.xml",
"README.md"
Expand Down

0 comments on commit 632948c

Please sign in to comment.