Skip to content

Commit 898a410

Browse files
authored
CI Update 2025 (#72)
* Move to clang-format-17. * Update OSX build. * Update artifact handling.
1 parent a4661f0 commit 898a410

5 files changed

Lines changed: 12 additions & 13 deletions

File tree

.github/workflows/build/linux/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ runs:
4747
zip -9rv ../packages/Mildred-${{ env.mildredVersion }}-linux.zip Mildred-${{ env.mildredVersion }}-linux
4848
4949
- name: Upload Package Artifacts
50-
uses: actions/upload-artifact@v3
50+
uses: actions/upload-artifact@v4
5151
with:
52-
name: packages
52+
name: packages-linux-${{ runner.arch }}
5353
path: ${{ github.workspace }}/packages

.github/workflows/build/osx/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ runs:
99
shell: bash
1010
run: |
1111
set -ex
12-
sudo pip3 install conan aqtinstall
12+
sudo pip3 install conan==1.* aqtinstall --break-system-packages
1313
aqt install-qt --outputdir /tmp/qt mac desktop ${{ env.qtVersion }} -m qt3d
1414
1515
- name: Build
@@ -34,7 +34,7 @@ runs:
3434
zip -9rv ../packages/Mildred-${{ env.mildredVersion }}-osx.zip Mildred-${{ env.mildredVersion }}-osx
3535
3636
- name: Upload Raw Build Artifacts
37-
uses: actions/upload-artifact@v3
37+
uses: actions/upload-artifact@v4
3838
with:
39-
name: packages
39+
name: packages-osx-${{ runner.arch }}
4040
path: ${{ github.workspace }}/packages

.github/workflows/build/windows/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
7z a ../packages/Mildred-${{ env.mildredVersion }}-windows.zip Mildred-${{ env.mildredVersion }}-windows/
3333
3434
- name: Upload Raw Build Artifacts
35-
uses: actions/upload-artifact@v3
35+
uses: actions/upload-artifact@v4
3636
with:
37-
name: packages
37+
name: packages-windows-${{ runner.arch }}
3838
path: ${{ github.workspace }}/packages

.github/workflows/publish/action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ runs:
1010
steps:
1111

1212
- name: Download Artifacts
13-
uses: actions/download-artifact@v3
13+
uses: actions/download-artifact@v4
1414
with:
15-
name: packages
15+
pattern: packages-*
16+
merge-multiple: true
1617
path: ${{ github.workspace }}/packages
1718

1819
- name: Download Prerequisites

.github/workflows/qc/action.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@ runs:
88
shell: bash
99
run: |
1010
set -ex
11-
sudo apt-get update
12-
sudo apt-get install --yes clang-format-13
1311
pip install cmake_format==0.6.9
1412
1513
- name: C++ Formatting
1614
shell: bash
1715
run: |
1816
set -ex
19-
clang-format-13 --version
20-
find src/ examples/ -type f -regex '.*\.\(c\|cpp\|h\|hpp\|hui\)' -exec clang-format-13 -i {} +
17+
clang-format-17 --version
18+
find src/ examples/ -type f -regex '.*\.\(c\|cpp\|h\|hpp\|hui\)' -exec clang-format-17 -i {} +
2119
git diff
2220
git diff --quiet
2321

0 commit comments

Comments
 (0)