From 6cfcd62c9d5a299e2b47e63f6dd0e8fbfdd05713 Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Mon, 24 Jun 2024 10:50:57 +0200
Subject: [PATCH] GitHub Actions: Fix beta/rc tag handling and update versions

The beta/rc tag was not properly handled and all beta/rc releases were
marked as final releases.

The updated from actions/*@v3 to actions/*@v4 will get rid of the
node.js update warnings.

Lastly the macos-latest runner is actually 14 nowadays.

Change-Id: Ia4483012195fcac938ed0eec59d9e9812f1f3c05
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 .github/workflows/build_cmake.yml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index 6f0223b578b..7cbe1ce5b7f 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -49,13 +49,12 @@ jobs:
           }
         - {
             name: "macOS Latest Clang", artifact: "macos-universal",
-            # TODO: move back to macos-latest when macos-latest is 13 or higher
-            os: macos-13,
+            os: macos-latest,
             cc: "clang", cxx: "clang++"
           }
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Checkout submodules
       id: git
       shell: cmake -P {0}
@@ -63,10 +62,10 @@ jobs:
         execute_process(COMMAND git submodule set-url -- perfparser https://code.qt.io/qt-creator/perfparser.git)
         execute_process(COMMAND git submodule update --init --recursive)
         file(MAKE_DIRECTORY release)
-        if (${{github.ref}} MATCHES "tags/v([0-9.]+)")
+        if (${{github.ref}} MATCHES "tags/v(([0-9.]+).*)")
             file(APPEND "$ENV{GITHUB_OUTPUT}" "tag=${CMAKE_MATCH_1}\n")
-            if (EXISTS "dist/changelog/changes-${CMAKE_MATCH_1}.md")
-                file(READ "dist/changelog/changes-${CMAKE_MATCH_1}.md" changelog_md)
+            if (EXISTS "dist/changelog/changes-${CMAKE_MATCH_2}.md")
+                file(READ "dist/changelog/changes-${CMAKE_MATCH_2}.md" changelog_md)
             endif()
             file(WRITE "release/changelog.md" "These packages are not officially supported, for official packages please check out https://download.qt.io/official_releases/qtcreator\n\n")
             file(APPEND "release/changelog.md" "${changelog_md}")
@@ -695,41 +694,41 @@ jobs:
         endif()
 
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
         name: qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
 
     - name: Upload Devel
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}_dev.7z
         name: qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}_dev.7z
 
     - name: Upload wininterrupt
       if: runner.os == 'Windows'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/wininterrupt-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
         name: wininterrupt-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
 
     - name: Upload qtcreatorcdbext
       if: runner.os == 'Windows' && matrix.config.is_msvc
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/qtcreatorcdbext-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
         name: qtcreatorcdbext-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.7z
 
     - name: Upload Debian package
       if: runner.os == 'Linux'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/build/qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.deb
         name: qtcreator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.deb
 
     - name: Upload disk image
       if: runner.os == 'macOS' && contains(github.ref, 'tags/v')
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: build/qt-creator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.dmg
         name: qt-creator-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}.dmg
@@ -739,14 +738,14 @@ jobs:
       run: cmake -E tar cf ../${{ steps.ccache.outputs.archive_name }}.tar .
 
     - name: Upload ccache archive
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: ./${{ steps.ccache.outputs.archive_name }}.tar
         name: ${{ steps.ccache.outputs.archive_name }}
 
     - name: Upload Release Changelog
       if: contains(github.ref, 'tags/v')
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: ./release/changelog.md
         name: changelog.md
@@ -758,7 +757,7 @@ jobs:
 
     steps:
     - name: Download artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         path: release-with-dirs
 
@@ -770,7 +769,7 @@ jobs:
 
     - name: Create Release
       id: create_release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with: