diff --git a/.github/workflows/build/linux/action.yml b/.github/workflows/build/linux/action.yml index e1dcb2c..9a5b249 100644 --- a/.github/workflows/build/linux/action.yml +++ b/.github/workflows/build/linux/action.yml @@ -47,7 +47,7 @@ runs: zip -9rv ../packages/Mildred-${{ env.mildredVersion }}-linux.zip Mildred-${{ env.mildredVersion }}-linux - name: Upload Package Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: packages + name: packages-linux-${{ runner.arch }} path: ${{ github.workspace }}/packages diff --git a/.github/workflows/build/osx/action.yml b/.github/workflows/build/osx/action.yml index 9dceaa8..563210b 100644 --- a/.github/workflows/build/osx/action.yml +++ b/.github/workflows/build/osx/action.yml @@ -9,7 +9,7 @@ runs: shell: bash run: | set -ex - sudo pip3 install conan aqtinstall + sudo pip3 install conan==1.* aqtinstall --break-system-packages aqt install-qt --outputdir /tmp/qt mac desktop ${{ env.qtVersion }} -m qt3d - name: Build @@ -34,7 +34,7 @@ runs: zip -9rv ../packages/Mildred-${{ env.mildredVersion }}-osx.zip Mildred-${{ env.mildredVersion }}-osx - name: Upload Raw Build Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: packages + name: packages-osx-${{ runner.arch }} path: ${{ github.workspace }}/packages diff --git a/.github/workflows/build/windows/action.yml b/.github/workflows/build/windows/action.yml index 426fd4d..37ed0f2 100644 --- a/.github/workflows/build/windows/action.yml +++ b/.github/workflows/build/windows/action.yml @@ -32,7 +32,7 @@ runs: 7z a ../packages/Mildred-${{ env.mildredVersion }}-windows.zip Mildred-${{ env.mildredVersion }}-windows/ - name: Upload Raw Build Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: packages + name: packages-windows-${{ runner.arch }} path: ${{ github.workspace }}/packages diff --git a/.github/workflows/publish/action.yml b/.github/workflows/publish/action.yml index dc343d2..2ef31c3 100644 --- a/.github/workflows/publish/action.yml +++ b/.github/workflows/publish/action.yml @@ -10,9 +10,10 @@ runs: steps: - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: packages + pattern: packages-* + merge-multiple: true path: ${{ github.workspace }}/packages - name: Download Prerequisites diff --git a/.github/workflows/qc/action.yml b/.github/workflows/qc/action.yml index 733d4d4..10e0093 100644 --- a/.github/workflows/qc/action.yml +++ b/.github/workflows/qc/action.yml @@ -8,16 +8,14 @@ runs: shell: bash run: | set -ex - sudo apt-get update - sudo apt-get install --yes clang-format-13 pip install cmake_format==0.6.9 - name: C++ Formatting shell: bash run: | set -ex - clang-format-13 --version - find src/ examples/ -type f -regex '.*\.\(c\|cpp\|h\|hpp\|hui\)' -exec clang-format-13 -i {} + + clang-format-17 --version + find src/ examples/ -type f -regex '.*\.\(c\|cpp\|h\|hpp\|hui\)' -exec clang-format-17 -i {} + git diff git diff --quiet