From 1e6767ac030ffb02ffb275182f5c5621b7c93e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 9 Aug 2024 15:37:43 +0200 Subject: [PATCH] Sync GHA setup --- .../actions/await-http-resource/action.yml | 20 +++++++++++++++++++ .github/actions/build/action.yml | 8 ++++---- .../actions/create-github-release/action.yml | 4 ++-- .../actions/prepare-gradle-build/action.yml | 8 ++++---- .../actions/sync-to-maven-central/action.yml | 15 ++++---------- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- 7 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 .github/actions/await-http-resource/action.yml diff --git a/.github/actions/await-http-resource/action.yml b/.github/actions/await-http-resource/action.yml new file mode 100644 index 00000000000..7d2b3462b53 --- /dev/null +++ b/.github/actions/await-http-resource/action.yml @@ -0,0 +1,20 @@ +name: Await HTTP Resource +description: Waits for an HTTP resource to be available (a HEAD request succeeds) +inputs: + url: + description: 'The URL of the resource to await' + required: true +runs: + using: composite + steps: + - name: Await HTTP resource + shell: bash + run: | + url=${{ inputs.url }} + echo "Waiting for $url" + until curl --fail --head --silent ${{ inputs.url }} > /dev/null + do + echo "." + sleep 60 + done + echo "$url is available" diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 5bd86013994..78188ae631b 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -5,10 +5,10 @@ inputs: required: false default: '17' description: 'The Java version to compile and test with' - java-distribution: + java-early-access: required: false - default: 'liberica' - description: 'The Java distribution to use for the build' + default: 'false' + description: 'Whether the Java version is in early access' java-toolchain: required: false default: 'false' @@ -35,7 +35,7 @@ runs: with: develocity-access-key: ${{ inputs.develocity-access-key }} java-version: ${{ inputs.java-version }} - java-distribution: ${{ inputs.java-distribution }} + java-early-access: ${{ inputs.java-early-access }} java-toolchain: ${{ inputs.java-toolchain }} - name: Build id: build diff --git a/.github/actions/create-github-release/action.yml b/.github/actions/create-github-release/action.yml index 0354737e5df..e0120764f1e 100644 --- a/.github/actions/create-github-release/action.yml +++ b/.github/actions/create-github-release/action.yml @@ -2,10 +2,10 @@ name: Create GitHub Release description: Create the release on GitHub with a changelog inputs: milestone: - description: 'Name of the GitHub milestone for which a release will be created' + description: Name of the GitHub milestone for which a release will be created required: true token: - description: 'Token to use for authentication with GitHub' + description: Token to use for authentication with GitHub required: true runs: using: composite diff --git a/.github/actions/prepare-gradle-build/action.yml b/.github/actions/prepare-gradle-build/action.yml index b7836624f4b..b39722acfdf 100644 --- a/.github/actions/prepare-gradle-build/action.yml +++ b/.github/actions/prepare-gradle-build/action.yml @@ -5,10 +5,10 @@ inputs: required: false default: '17' description: 'The Java version to use for the build' - java-distribution: + java-early-access: required: false - default: 'liberica' - description: 'The Java distribution to use for the build' + default: 'false' + description: 'Whether the Java version is in early access' java-toolchain: required: false default: 'false' @@ -22,7 +22,7 @@ runs: - name: Set Up Java uses: actions/setup-java@v4 with: - distribution: ${{ inputs.java-distribution }} + distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || 'liberica' }} java-version: | ${{ inputs.java-version }} ${{ inputs.java-toolchain == 'true' && '17' || '' }} diff --git a/.github/actions/sync-to-maven-central/action.yml b/.github/actions/sync-to-maven-central/action.yml index 90d02c0432b..d4e86caf119 100644 --- a/.github/actions/sync-to-maven-central/action.yml +++ b/.github/actions/sync-to-maven-central/action.yml @@ -20,7 +20,7 @@ runs: using: composite steps: - name: Set Up JFrog CLI - uses: jfrog/setup-jfrog-cli@8bab65dc312163b065ac5b03de6f6a5bdd1bec41 # v4.1.3 + uses: jfrog/setup-jfrog-cli@105617d23456a69a92485207c4f28ae12297581d # v4.2.1 env: JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }} - name: Download Release Artifacts @@ -38,13 +38,6 @@ runs: release: true generate-checksums: true - name: Await - shell: bash - run: | - url=${{ format('https://repo.maven.apache.org/maven2/org/springframework/spring-context/{0}/spring-context-{0}.jar', inputs.spring-framework-version) }} - echo "Waiting for $url" - until curl --fail --head --silent $url > /dev/null - do - echo "." - sleep 60 - done - echo "$url is available" + uses: ./.github/actions/await-http-resource + with: + url: ${{ format('https://repo.maven.apache.org/maven2/org/springframework/spring-context/{0}/spring-context-{0}.jar', inputs.spring-framework-version) }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c6b7115206..e9931a6444d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: uses: ./.github/actions/build with: java-version: ${{ matrix.java.version }} - java-distribution: ${{ matrix.java.distribution || 'liberica' }} + java-early-access: ${{ matrix.java.early-access || 'false' }} java-toolchain: ${{ matrix.java.toolchain }} develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} - name: Send Notification diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d1d67217b53..81b17ee1dc9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up JFrog CLI - uses: jfrog/setup-jfrog-cli@8bab65dc312163b065ac5b03de6f6a5bdd1bec41 # v4.1.3 + uses: jfrog/setup-jfrog-cli@105617d23456a69a92485207c4f28ae12297581d # v4.2.1 env: JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - name: Promote build