Skip to content

Commit f2904bb

Browse files
committed
test setup-ci
1 parent 6a0a2ae commit f2904bb

File tree

3 files changed

+6
-42
lines changed

3 files changed

+6
-42
lines changed

Diff for: .github/workflows/release.yml

+3-41
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,11 @@ jobs:
99
linux:
1010
name: Linux
1111
runs-on: ubuntu-20.04
12-
env:
13-
INSTALL_PREFIX: "/opt/smelibs"
14-
SUDO_CMD: "sudo"
15-
TARGET_TRIPLE: "x86_64-unknown-linux-gnu"
16-
PYTHON_EXE: "/usr/bin/python3"
17-
OS: "linux"
18-
CC: "clang"
19-
CXX: "clang++"
2012
defaults:
2113
run:
2214
shell: bash
2315
steps:
24-
- name: Add llvm repo for clang 18 & install
25-
run: |
26-
sudo wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
27-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main"
28-
sudo apt update -yy
29-
sudo apt install -yy clang-18
30-
- name: Set clang version
31-
run: |
32-
sudo update-alternatives --remove-all clang || echo "nothing to remove"
33-
sudo update-alternatives --remove-all clang++ || echo "nothing to remove"
34-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100
35-
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100
16+
- uses: spatial-model-editor/setup-ci@v1
3617
- uses: actions/checkout@v4
3718
- name: Build script
3819
run: ./build.sh
@@ -44,21 +25,12 @@ jobs:
4425
macos:
4526
name: MacOS
4627
runs-on: macos-13
47-
env:
48-
INSTALL_PREFIX: "/opt/smelibs"
49-
SUDO_CMD: "sudo"
50-
TARGET_TRIPLE: "x86_64-apple-darwin16"
51-
PYTHON_EXE: "/usr/bin/python3"
52-
MACOSX_DEPLOYMENT_TARGET: "11"
53-
OS: "osx"
5428
defaults:
5529
run:
5630
shell: bash
5731
steps:
32+
- uses: spatial-model-editor/setup-ci@v1
5833
- uses: actions/checkout@v4
59-
- uses: maxim-lobanov/setup-xcode@v1
60-
with:
61-
xcode-version: "14.3"
6234
- name: Build script
6335
run: ./build.sh
6436
- uses: actions/upload-artifact@v4
@@ -69,22 +41,12 @@ jobs:
6941
win64-mingw:
7042
name: Windows 64-bit Mingw
7143
runs-on: windows-2022
72-
env:
73-
INSTALL_PREFIX: "/c/smelibs"
74-
SUDO_CMD: ""
75-
TARGET_TRIPLE: "x86_64-w64-windows-gnu"
76-
PYTHON_EXE: "/ucrt64/bin/python"
77-
OS: "win64-mingw"
7844
defaults:
7945
run:
8046
shell: msys2 {0}
8147
steps:
48+
- uses: spatial-model-editor/setup-ci@v1
8249
- uses: actions/checkout@v4
83-
- uses: msys2/setup-msys2@v2
84-
with:
85-
msystem: UCRT64
86-
update: true
87-
install: mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-python make
8850
- name: Build script
8951
run: ./build.sh
9052
- uses: actions/upload-artifact@v4

Diff for: .pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.5.0
3+
rev: v4.6.0
44
hooks:
55
- id: check-yaml
66
- id: end-of-file-fixer

Diff for: build.sh

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ cmake --version
1919
which python
2020
python --version
2121

22+
exit
23+
2224
NPROCS=4
2325
if [[ "$OS_TARGET" == "osx" ]]; then
2426
NPROCS=3

0 commit comments

Comments
 (0)