Skip to content

Commit

Permalink
CI Update 2025 (#72)
Browse files Browse the repository at this point in the history
* Move to clang-format-17.

* Update OSX build.

* Update artifact handling.
  • Loading branch information
trisyoungs authored Jan 22, 2025
1 parent a4661f0 commit 898a410
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build/linux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/build/osx/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/build/windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions .github/workflows/publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/qc/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 898a410

Please sign in to comment.