Merge branch 'gluonhq:master' into issue-120

gluonhq · Nov 10, 2024 · 2cbaffc · 2cbaffc
2 parents 8094085 + ceece31
commit 2cbaffc
Show file tree

Hide file tree

Showing 8 changed files with 271 additions and 15 deletions.
diff --git a/.github/assets/gluon_logo.svg b/.github/assets/gluon_logo.svg
diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml
@@ -51,7 +51,7 @@ jobs:
           release: ${{ inputs.java-release }}
           version: ${{ inputs.java-version }}
 
-      - uses: Apple-Actions/import-codesign-certs@v1
+      - uses: Apple-Actions/import-codesign-certs@v3
         with:
           p12-file-base64: ${{ secrets.CERTIFICATES_FILE_BASE64 }}
           p12-password: ${{ secrets.CERTIFICATES_PASSWORD }}

diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml
@@ -52,7 +52,7 @@ jobs:
           release: ${{ inputs.java-release }}
           version: ${{ inputs.java-version }}
 
-      - uses: Apple-Actions/import-codesign-certs@v1
+      - uses: Apple-Actions/import-codesign-certs@v3
         with:
           p12-file-base64: ${{ secrets.CERTIFICATES_FILE_BASE64 }}
           p12-password: ${{ secrets.CERTIFICATES_PASSWORD }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,6 +9,10 @@ on:
         options:
           - RC
           - GA
+      rc_version:
+        type: string
+        default: ''
+        description: 'If candidate is RC, set a version like RC1 or RC2, else leave it empty'
 
 env:
   JAVA_RELEASE: '23'
@@ -53,7 +57,11 @@ jobs:
           S3_PATH=$PROJECT_VERSION
           CANDIDATE=${{ github.event.inputs.candidate }}
           if [[ "$CANDIDATE" == RC ]]; then
-              PROJECT_VERSION=${PROJECT_VERSION}-RC
+              RC_VERSION=${{ github.event.inputs.rc_version }}
+              if [[ "$RC_VERSION" == "" ]]; then
+                RC_VERSION="RC"
+              fi
+              PROJECT_VERSION=${PROJECT_VERSION}-${RC_VERSION}
               S3_PATH=RC/$PROJECT_VERSION
           fi
           echo "Releasing.. "$PROJECT_VERSION