Merge remote-tracking branch 'origin/9.0'

Change-Id: I2123e09f75199a63af6e8505fb8889e7f9d025d2
zatochi · Nov 16, 2022 · ae67799 · ae67799
2 parents f297b3f + 779dc52
commit ae67799
Show file tree

Hide file tree

Showing 22 changed files with 195 additions and 124 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -7,7 +7,7 @@ on:
       - 'doc/**'
 
 env:
-  QT_VERSION: 6.3.2
+  QT_VERSION: 6.4.1
   CLANG_VERSION: 15.0.0
   ELFUTILS_VERSION: 0.175
   CMAKE_VERSION: 3.21.1
@@ -51,7 +51,7 @@ jobs:
           }
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Checkout submodules
       run: |
         git submodule set-url -- perfparser https://code.qt.io/qt-creator/perfparser.git
@@ -211,7 +211,7 @@ jobs:
 
         # Save the path for other steps
         file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qt6/${qt_dir_prefix}" qt_dir)
-        message("::set-output name=qt_dir::${qt_dir}")
+        file(APPEND "$ENV{GITHUB_OUTPUT}" "qt_dir=${qt_dir}")
 
         function(downloadAndExtract url archive)
           foreach(qt_mirror $ENV{QT_MIRRORS})
@@ -378,7 +378,7 @@ jobs:
 
         # Save the path for other steps
         file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/libclang" libclang_dir)
-        message("::set-output name=libclang_dir::${libclang_dir}")
+        file(APPEND "$ENV{GITHUB_OUTPUT}" "libclang_dir=${libclang_dir}")
 
     - name: Download elfutils
       if: runner.os == 'Windows' && matrix.config.is_msvc || runner.os == 'Linux'
@@ -414,7 +414,7 @@ jobs:
 
         # Save the path for other steps
         file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/elfutils" elfutils_dir)
-        message("::set-output name=elfutils_dir::${elfutils_dir}")
+        file(APPEND "$ENV{GITHUB_OUTPUT}" "elfutils_dir=${elfutils_dir}")
 
     - name: Download ccache
       shell: cmake -P {0}
@@ -437,7 +437,7 @@ jobs:
         include(${github_workspace}/cmake/QtCreatorIDEBranding.cmake)
         string(REPLACE "." ";" IDE_VERSION_LIST ${IDE_VERSION_DISPLAY})
         list(GET IDE_VERSION_LIST 0 IDE_VERSION_MAJOR)
-        message("::set-output name=archive_name::ccache-${{ matrix.config.os }}-${{ matrix.config.cc }}-qtc${IDE_VERSION_MAJOR}")
+        file(APPEND "$ENV{GITHUB_OUTPUT}" "archive_name=ccache-${{ matrix.config.os }}-${{ matrix.config.cc }}-qtc${IDE_VERSION_MAJOR}")
 
     - name: Download ccache archive
       shell: cmake -P {0}
@@ -639,34 +639,34 @@ jobs:
         endif()
 
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: build/qtcreator-${{ matrix.config.artifact }}-${{ github.run_id }}.7z
         name: qtcreator-${{ matrix.config.artifact }}-${{ github.run_id }}.7z
 
     - name: Upload Devel
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: build/qtcreator-${{ matrix.config.artifact }}-${{ github.run_id }}_dev.7z
         name: qtcreator-${{ matrix.config.artifact }}-${{ github.run_id }}_dev.7z
 
     - name: Upload wininterrupt
       if: runner.os == 'Windows'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: build/wininterrupt-${{ matrix.config.artifact }}-${{ github.run_id }}.7z
         name: wininterrupt-${{ matrix.config.artifact }}-${{ github.run_id }}.7z
 
     - name: Upload qtcreatorcdbext
       if: runner.os == 'Windows' && matrix.config.is_msvc
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: build/qtcreatorcdbext-${{ matrix.config.artifact }}-${{ github.run_id }}.7z
         name: qtcreatorcdbext-${{ matrix.config.artifact }}-${{ github.run_id }}.7z
 
     - name: Upload disk image
       if: runner.os == 'macOS' && contains(github.ref, 'tags/v')
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: build/qt-creator-${{ matrix.config.artifact }}-${{ github.run_id }}.dmg
         name: qt-creator-${{ matrix.config.artifact }}-${{ github.run_id }}.dmg
@@ -676,7 +676,7 @@ jobs:
       run: cmake -E tar cf ../${{ steps.ccache.outputs.archive_name }}.tar .
 
     - name: Upload ccache archive
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: ./${{ steps.ccache.outputs.archive_name }}.tar
         name: ${{ steps.ccache.outputs.archive_name }}
@@ -689,7 +689,7 @@ jobs:
     steps:
     - name: Create Release
       id: create_release
-      uses: actions/create-release@v1.0.0
+      uses: actions/create-release@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -702,7 +702,7 @@ jobs:
       run: |
         echo "${{ steps.create_release.outputs.upload_url }}" > ./upload_url
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         path: ./upload_url
         name: upload_url
@@ -735,50 +735,50 @@ jobs:
 
     steps:
     - name: Download artifact
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: qtcreator-${{ matrix.config.artifact }}-${{ github.run_id }}.7z
         path: ./
 
     - name: Download Devel artifact
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: qtcreator-${{ matrix.config.artifact }}-${{ github.run_id }}_dev.7z
         path: ./
 
     - name: Download wininterrupt artifact
       if: contains(matrix.config.artifact, 'Windows')
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: wininterrupt-${{ matrix.config.artifact }}-${{ github.run_id }}.7z
         path: ./
 
     - name: Download qtcreatorcdbext artifact
       if: matrix.config.artifact == 'Windows-MSVC'
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: qtcreatorcdbext-${{ matrix.config.artifact }}-${{ github.run_id }}.7z
         path: ./
 
     - name: Download disk image artifact
       if: matrix.config.artifact == 'macOS'
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: qt-creator-${{ matrix.config.artifact }}-${{ github.run_id }}.dmg
         path: ./
 
     - name: Download URL
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: upload_url
         path: ./
     - id: set_upload_url
       run: |
         upload_url=`cat ./upload_url`
-        echo ::set-output name=upload_url::$upload_url
+        echo upload_url=$upload_url >> $GITHUB_OUTPUT
 
     - name: Upload to Release
-      uses: actions/upload-release-asset@v1.0.1
+      uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -788,7 +788,7 @@ jobs:
         asset_content_type: application/x-gtar
 
     - name: Upload Devel to Release
-      uses: actions/upload-release-asset@v1.0.1
+      uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -799,7 +799,7 @@ jobs:
 
     - name: Upload wininterrupt to Release
       if: contains(matrix.config.artifact, 'Windows')
-      uses: actions/upload-release-asset@v1.0.1
+      uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -810,7 +810,7 @@ jobs:
 
     - name: Upload qtcreatorcdbext to Release
       if: matrix.config.artifact == 'Windows-MSVC'
-      uses: actions/upload-release-asset@v1.0.1
+      uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -821,7 +821,7 @@ jobs:
 
     - name: Upload disk image to Release
       if: matrix.config.artifact == 'macOS'
-      uses: actions/upload-release-asset@v1.0.1
+      uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml
@@ -1,5 +1,8 @@
 type: Group
 instructions:
+  - type: MakeDirectory
+    directory: "{{.AgentWorkingDir}}/build/qt_temp"
+
   - type: Group
     instructions:
       - type: ExecuteCommand

diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml
@@ -10,7 +10,7 @@ instructions:
         variableValue: http://master.qt.io/development_releases/prebuilt/libclang/libclang-release_15.0.0-based
       - type: EnvironmentVariable
         variableName: QTC_QT_BASE_URL
-        variableValue: "http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.2-final-released/Qt"
+        variableValue: "http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.4/6.4.1-released/Qt"
       - type: EnvironmentVariable
         variableName: QTC_QT_MODULES
         variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine"

diff --git a/coin/instructions/provision.yaml b/coin/instructions/provision.yaml
@@ -41,7 +41,7 @@ instructions:
       property: host.os
       in_values: [MacOS, Linux]
   - type: ExecuteCommand
-    command: "python3 -u {{.AgentWorkingDir}}/build/qtsdk/packaging-tools/install_qt.py --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --temp-path {{.AgentWorkingDir}}/build/qt_temp --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --icu7z http://master.qt.io/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}"
+    command: "python3 -u {{.AgentWorkingDir}}/build/qtsdk/packaging-tools/install_qt.py --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --icu7z http://master.qt.io/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}"
     executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
     maxTimeInSeconds: 3600
     maxTimeBetweenOutput: 360
@@ -51,7 +51,7 @@ instructions:
       property: host.os
       equals_value: Linux
   - type: ExecuteCommand
-    command: "python3 -u {{.AgentWorkingDir}}/build/qtsdk/packaging-tools/install_qt.py --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --temp-path {{.AgentWorkingDir}}/build/qt_temp --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} {{.Env.QTC_QT_MODULES}}"
+    command: "python3 -u {{.AgentWorkingDir}}/build/qtsdk/packaging-tools/install_qt.py --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} {{.Env.QTC_QT_MODULES}}"
     executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
     maxTimeInSeconds: 3600
     maxTimeBetweenOutput: 360
@@ -70,7 +70,7 @@ instructions:
       property: host.os
       equals_value: Windows
   - type: ExecuteCommand
-    command: "python -u {{.AgentWorkingDir}}/build/qtsdk/packaging-tools/install_qt.py --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --temp-path {{.AgentWorkingDir}}/build/qt_temp --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --opengl32sw7z http://master.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64.7z --d3dcompiler7z http://master.qt.io/development_releases/prebuilt/d3dcompiler/msvc2013/d3dcompiler_47-x64.7z --openssl7z http://ci-files02-hki.intra.qt.io/packages/jenkins/openssl/openssl_1.1.1d_prebuild_x64.7z {{.Env.QTC_QT_MODULES}}"
+    command: "python -u {{.AgentWorkingDir}}/build/qtsdk/packaging-tools/install_qt.py --qt-path {{.AgentWorkingDir}}/build/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --opengl32sw7z http://master.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64.7z --d3dcompiler7z http://master.qt.io/development_releases/prebuilt/d3dcompiler/msvc2013/d3dcompiler_47-x64.7z --openssl7z http://ci-files02-hki.intra.qt.io/packages/jenkins/openssl/openssl_1.1.1d_prebuild_x64.7z {{.Env.QTC_QT_MODULES}}"
     executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
     maxTimeInSeconds: 3600
     maxTimeBetweenOutput: 360