Merge branch '3.3.x' into 3.4.x

Closes gh-43814
This commit is contained in:
Stéphane Nicoll 2025-01-14 10:37:51 +01:00
commit 18534a44e8
3 changed files with 3 additions and 3 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@dff217c085c17666e8849ebdbf29c8fe5e3995e6 # v4.5.2 uses: jfrog/setup-jfrog-cli@f748a0599171a192a2668afee8d0497f7c1069df # v4.5.6
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

@ -20,7 +20,7 @@ runs:
using: composite using: composite
steps: steps:
- name: Set Up JFrog CLI - name: Set Up JFrog CLI
uses: jfrog/setup-jfrog-cli@dff217c085c17666e8849ebdbf29c8fe5e3995e6 # v4.5.2 uses: jfrog/setup-jfrog-cli@f748a0599171a192a2668afee8d0497f7c1069df # v4.5.6
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

@ -78,7 +78,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@dff217c085c17666e8849ebdbf29c8fe5e3995e6 # v4.5.2 uses: jfrog/setup-jfrog-cli@f748a0599171a192a2668afee8d0497f7c1069df # v4.5.6
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