Skip to content

Commit a9bc844

Browse files
committed
add linux arm64 build
1 parent beeb351 commit a9bc844

File tree

3 files changed

+48
-45
lines changed

3 files changed

+48
-45
lines changed

.github/workflows/release.yml

+45-43
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,25 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
include:
18-
- os: "ubuntu-22.04"
18+
# - os: "ubuntu-22.04"
19+
# shell: "bash"
20+
# CONFIGURE_EXTRAS: "-DFEATURE_xcb=ON -DINPUT_bundled_xcb_xinput=yes -DFEATURE_libudev=OFF"
21+
- os: "ubuntu-22.04-arm"
1922
shell: "bash"
20-
CONFIGURE_EXTRAS: "-DFEATURE_xcb=ON -DINPUT_bundled_xcb_xinput=yes -DFEATURE_libudev=OFF"
21-
- os: "macos-13"
22-
shell: "bash"
23-
- os: "macos-14"
24-
shell: "bash"
25-
- os: "windows-2022"
26-
shell: "msys2 {0}"
27-
CONFIGURE_EXTRAS: "-DQT_QMAKE_TARGET_MKSPEC=win32-g++"
23+
# - os: "macos-13"
24+
# shell: "bash"
25+
# - os: "macos-14"
26+
# shell: "bash"
27+
# - os: "windows-2022"
28+
# shell: "msys2 {0}"
29+
# CONFIGURE_EXTRAS: "-DQT_QMAKE_TARGET_MKSPEC=win32-g++"
2830
defaults:
2931
run:
3032
shell: ${{ matrix.shell }}
31-
env:
32-
CONFIGURE_EXTRAS: ${{ matrix.CONFIGURE_EXTRAS }}
33+
# env:
34+
# CONFIGURE_EXTRAS: ${{ matrix.CONFIGURE_EXTRAS }}
3335
steps:
34-
- uses: spatial-model-editor/setup-ci@2025.01.02
36+
- uses: spatial-model-editor/setup-ci@2025.01.30
3537
- uses: actions/checkout@v4
3638
- run: ./build.sh
3739
- name: Upload binaries to release if commit is tagged
@@ -43,34 +45,34 @@ jobs:
4345
tag: ${{ github.ref }}
4446
overwrite: true
4547
file_glob: true
46-
msvc:
47-
runs-on: windows-2022
48-
permissions:
49-
contents: write
50-
strategy:
51-
fail-fast: false
52-
matrix:
53-
include:
54-
- os: "win64-msvc"
55-
arch: "amd64"
56-
- os: "win32-msvc"
57-
arch: "amd64_x86"
58-
env:
59-
INSTALL_PREFIX: 'C:\smelibs'
60-
OS: ${{ matrix.os }}
61-
steps:
62-
- uses: actions/checkout@v4
63-
- uses: ilammy/msvc-dev-cmd@v1
64-
with:
65-
arch: ${{ matrix.arch }}
66-
toolset: 14.0
67-
- run: ./build.ps1
68-
- name: Upload binaries to release if commit is tagged
69-
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
70-
uses: svenstaro/upload-release-action@v2
71-
with:
72-
repo_token: ${{ secrets.GITHUB_TOKEN }}
73-
file: ./artefacts/*
74-
tag: ${{ github.ref }}
75-
overwrite: true
76-
file_glob: true
48+
# msvc:
49+
# runs-on: windows-2022
50+
# permissions:
51+
# contents: write
52+
# strategy:
53+
# fail-fast: false
54+
# matrix:
55+
# include:
56+
# - os: "win64-msvc"
57+
# arch: "amd64"
58+
# - os: "win32-msvc"
59+
# arch: "amd64_x86"
60+
# env:
61+
# INSTALL_PREFIX: 'C:\smelibs'
62+
# OS: ${{ matrix.os }}
63+
# steps:
64+
# - uses: actions/checkout@v4
65+
# - uses: ilammy/msvc-dev-cmd@v1
66+
# with:
67+
# arch: ${{ matrix.arch }}
68+
# toolset: 14.0
69+
# - run: ./build.ps1
70+
# - name: Upload binaries to release if commit is tagged
71+
# if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
72+
# uses: svenstaro/upload-release-action@v2
73+
# with:
74+
# repo_token: ${{ secrets.GITHUB_TOKEN }}
75+
# file: ./artefacts/*
76+
# tag: ${{ github.ref }}
77+
# overwrite: true
78+
# file_glob: true

.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ repos:
1111
- id: mixed-line-ending
1212
exclude: '.*\.diff$'
1313
- repo: https://github.com/rhysd/actionlint
14-
rev: v1.7.6
14+
rev: v1.7.7
1515
hooks:
1616
- id: actionlint
1717
- repo: https://github.com/pecigonzalo/pre-commit-shfmt
1818
rev: v2.2.0
1919
hooks:
2020
- id: shell-fmt-go
2121
- repo: https://github.com/google/yamlfmt
22-
rev: v0.14.0
22+
rev: v0.15.0
2323
hooks:
2424
- id: yamlfmt
2525
ci:

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and used instead of the bundled Qt version (does not apply to msvc builds)
1111
Get the latest versions here:
1212

1313
- linux (clang 19 / Ubuntu 22.04): [sme_deps_qt_linux.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_linux.tgz)
14+
- linux-arm64 (clang 19 / Ubuntu 22.04): [sme_deps_qt_linux-arm64.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_linux-arm64.tgz)
1415
- osx (Xcode 15.2 / macOS 13 / MACOSX_DEPLOYMENT_TARGET 12): [sme_deps_qt_osx.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_osx.tgz)
1516
- osx-arm64 (Xcode 16.1 / macOS 14 / MACOSX_DEPLOYMENT_TARGET 12): [sme_deps_qt_osx-arm64.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_osx-arm64.tgz)
1617
- win64-mingw (mingw-w64-x86_64-gcc 14): [sme_deps_qt_win64-mingw.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_win64-mingw.tgz)

0 commit comments

Comments
 (0)