Skip to content

Commit

Permalink
Merge branch '3.1.x' into 3.2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
mhalbritter committed Apr 18, 2024
2 parents f84a263 + 6b44072 commit f5b51ab
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/actions/create-github-release/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ runs:
with:
milestone: ${{ inputs.milestone }}
token: ${{ inputs.token }}
config-file: ${{ github.action_path }}/changelog-generator.yml
config-file: .github/actions/create-github-release/changelog-generator.yml
- name: Create GitHub Release
env:
GITHUB_TOKEN: ${{ inputs.token }}
shell: bash
run: gh release create ${{ github.ref_name }} --notes-file changelog.md
run: gh release create ${{ format('v{0}', inputs.milestone) }} --notes-file changelog.md
24 changes: 12 additions & 12 deletions .github/actions/publish-to-sdkman/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ inputs:
sdkman-consumer-key:
description: 'Key for publishing to SDKMAN!'
required: true
sdkman-consumer-secret:
description: 'Secret for publishing to SDKMAN!'
sdkman-consumer-token:
description: 'Token for publishing to SDKMAN!'
required: true
spring-boot-version:
description: 'The version to publish'
Expand All @@ -20,19 +20,19 @@ runs:
- shell: bash
run: >
curl -X POST \
-H "Consumer-Key: ${{ inputs.sdkman-consumer-key }}"
-H "Consumer-Token: ${{ inputs.sdkman-consumer-token }}"
-H "Content-Type: application/json"
-H "Accept: application/json"
-d '{"candidate": "springboot", "version": "${{ inputs.spring-boot-version }}", "url": "${{ format('https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/{0}/spring-boot-cli-{0}-bin.zip', inputs.spring-boot-version)"}'
-H "Consumer-Key: ${{ inputs.sdkman-consumer-key }}" \
-H "Consumer-Token: ${{ inputs.sdkman-consumer-token }}" \
-H "Content-Type: application/json" \
-H "Accept: application/json" \
-d '{"candidate": "springboot", "version": "${{ inputs.spring-boot-version }}", "url": "${{ format('https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/{0}/spring-boot-cli-{0}-bin.zip', inputs.spring-boot-version) }}"}' \
https://vendors.sdkman.io/release
- shell: bash
if: ${{ inputs.make-default }}
run: >
curl -X POST \
-H "Consumer-Key: ${{ inputs.sdkman-consumer-key }}"
-H "Consumer-Token: ${{ inputs.sdkman-consumer-token }}"
-H "Content-Type: application/json"
-H "Accept: application/json"
-d '{"candidate": "springboot", "version": "${{ inputs.spring-boot-version }}"}'
-H "Consumer-Key: ${{ inputs.sdkman-consumer-key }}" \
-H "Consumer-Token: ${{ inputs.sdkman-consumer-token }}" \
-H "Content-Type: application/json" \
-H "Accept: application/json" \
-d '{"candidate": "springboot", "version": "${{ inputs.spring-boot-version }}"}' \
https://vendors.sdkman.io/default

0 comments on commit f5b51ab

Please sign in to comment.