Merge branch '3.5.x'

Closes gh-47426
This commit is contained in:
Stéphane Nicoll 2025-10-07 11:44:47 +02:00
commit cb51a44e2b
4 changed files with 4 additions and 4 deletions

View File

@ -21,7 +21,7 @@ runs:
using: composite using: composite
steps: steps:
- name: Set Up JFrog CLI - name: Set Up JFrog CLI
uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1 uses: jfrog/setup-jfrog-cli@c32bf10843e4071112c4ea3abf622d3b27cd8c17 # v4.7.0
env: env:
JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }} JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
- name: Download Artifacts - name: Download Artifacts

View File

@ -17,7 +17,7 @@ runs:
using: composite using: composite
steps: steps:
- name: Set Up JFrog CLI - name: Set Up JFrog CLI
uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1 uses: jfrog/setup-jfrog-cli@c32bf10843e4071112c4ea3abf622d3b27cd8c17 # v4.7.0
env: env:
JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }} JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
- name: Download Release Artifacts - name: Download Release Artifacts

View File

@ -75,7 +75,7 @@ jobs:
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }} runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
steps: steps:
- name: Set up JFrog CLI - name: Set up JFrog CLI
uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1 uses: jfrog/setup-jfrog-cli@c32bf10843e4071112c4ea3abf622d3b27cd8c17 # v4.7.0
env: env:
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
- name: Promote build - name: Promote build

View File

@ -86,7 +86,7 @@ jobs:
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }} runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
steps: steps:
- name: Set up JFrog CLI - name: Set up JFrog CLI
uses: jfrog/setup-jfrog-cli@88e9eba31c07e31beefa4cef5c0e93d1af9535d7 # v4.6.1 uses: jfrog/setup-jfrog-cli@c32bf10843e4071112c4ea3abf622d3b27cd8c17 # v4.7.0
env: env:
JF_ENV_SPRING: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_JF_ARTIFACTORY_SPRING || secrets.JF_ARTIFACTORY_SPRING }} JF_ENV_SPRING: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_JF_ARTIFACTORY_SPRING || secrets.JF_ARTIFACTORY_SPRING }}
- name: Promote open source build - name: Promote open source build