qt -> 6.6.1, update artifacts actions

spatial-model-editor · Jan 4, 2024 · 20bf535 · 20bf535
1 parent 2b196b3
commit 20bf535
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: Release Builds
 on: push
 
 env:
-  QT_VERSION: "v6.6.0"
+  QT_VERSION: "v6.6.1"
   ZLIB_VERSION: "v1.3" # not used for msvc builds
 
 jobs:
@@ -39,8 +39,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build script
         run: ./build.sh
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: artifacts-linux
           path: ./artefacts/*
 
   macos:
@@ -64,8 +65,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build script
         run: ./build.sh
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: artifacts-macos
           path: ./artefacts/*
 
   win64-mingw:
@@ -88,8 +90,9 @@ jobs:
           install: mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja git
       - name: Build script
         run: ./build.sh
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: artifacts-win64-mingw
           path: ./artefacts/*
 
   win32-mingw:
@@ -114,6 +117,7 @@ jobs:
         run: ./build.sh
       - uses: actions/upload-artifact@v3
         with:
+          name: artifacts-win32-mingw
           path: ./artefacts/*
 
   win64-msvc:
@@ -132,6 +136,7 @@ jobs:
         run: ./build.ps1
       - uses: actions/upload-artifact@v3
         with:
+          name: artifacts-win64-msvc
           path: ./artefacts/*
 
   win32-msvc:
@@ -150,6 +155,7 @@ jobs:
         run: ./build.ps1
       - uses: actions/upload-artifact@v3
         with:
+          name: artifacts-win32-msvc
           path: ./artefacts/*
 
   release:
@@ -160,9 +166,10 @@ jobs:
     # upload binaries to github release if commit is tagged
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          pattern: artifacts-*
+          merge-multiple: true
           path: binaries
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.3
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier