From 6c1962fdd4d59191b3ac2cf62d6afbfc6f506b86 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 10 May 2024 08:45:39 +0100 Subject: [PATCH] Fix handling of booleans that are actually strings Closes gh-40686 --- .github/actions/build/action.yml | 6 +++--- .github/actions/prepare-gradle-build/action.yml | 4 ++-- .github/actions/publish-to-sdkman/action.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index b46004315b20..e9c9239b8fff 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -19,7 +19,7 @@ inputs: outputs: build-scan-url: description: 'The URL, if any, of the build scan produced by the build' - value: ${{ (inputs.publish && steps.build-and-publish.outputs.build-scan-url) || steps.build.outputs.build-scan-url }} + value: ${{ (inputs.publish == 'true' && steps.build-and-publish.outputs.build-scan-url) || steps.build.outputs.build-scan-url }} version: description: 'The version that was built' value: ${{ steps.read-version.outputs.version }} @@ -33,14 +33,14 @@ runs: java-toolchain: ${{ inputs.java-toolchain }} - name: Build id: build - if: ${{ !inputs.publish }} + if: ${{ inputs.publish == 'false' }} shell: bash env: DEVELOCITY_ACCESS_KEY: ${{ inputs.develocity-access-key }} run: ./gradlew build - name: Build and Publish id: build-and-publish - if: ${{ inputs.publish }} + if: ${{ inputs.publish == 'true' }} shell: bash env: DEVELOCITY_ACCESS_KEY: ${{ inputs.develocity-access-key }} diff --git a/.github/actions/prepare-gradle-build/action.yml b/.github/actions/prepare-gradle-build/action.yml index ba27b27698db..962279db451e 100644 --- a/.github/actions/prepare-gradle-build/action.yml +++ b/.github/actions/prepare-gradle-build/action.yml @@ -18,7 +18,7 @@ runs: distribution: 'liberica' java-version: | ${{ inputs.java-version }} - ${{ inputs.java-toolchain && '17' || '' }} + ${{ inputs.java-toolchain == 'true' && '17' || '' }} - name: Set Up Gradle uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2 with: @@ -31,7 +31,7 @@ runs: echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties - name: Configure Toolchain Properties - if: ${{ inputs.java-toolchain }} + if: ${{ inputs.java-toolchain == 'true' }} shell: bash run: | echo toolchainVersion=${{ inputs.java-version }} >> $HOME/.gradle/gradle.properties diff --git a/.github/actions/publish-to-sdkman/action.yml b/.github/actions/publish-to-sdkman/action.yml index d0337b74059e..2d23b18232bc 100644 --- a/.github/actions/publish-to-sdkman/action.yml +++ b/.github/actions/publish-to-sdkman/action.yml @@ -27,7 +27,7 @@ runs: -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 }} + if: ${{ inputs.make-default == 'true' }} run: > curl -X POST \ -H "Consumer-Key: ${{ inputs.sdkman-consumer-key }}" \