Skip to content

Commit 2c7a105

Browse files
committed
Attempt to make the automatic build pipeline more generic and support other platforms
Too much effort to get windows working, so for now I will just stick to ubuntu and macos.
1 parent e80ba12 commit 2c7a105

File tree

4 files changed

+8
-82
lines changed

4 files changed

+8
-82
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,23 @@ on:
1818
- "!**.md"
1919

2020
jobs:
21-
linux-amd64:
21+
build-all:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [ubuntu-24.04, ubuntu-24.04-arm] #macos-14, windows-latest
25+
os: [ubuntu-24.04, ubuntu-24.04-arm, macos-14] #windows-latest
2626
runs-on: ${{ matrix.os }}
2727
timeout-minutes: 8
2828
steps:
2929
- uses: actions/checkout@v4
3030
- name: Install dependencies
3131
run: |
32+
python3 -m venv .venv
33+
source .venv/bin/activate
3234
python3 -m pip install meson ninja
3335
- name: Configure and build
3436
run: |
37+
source .venv/bin/activate
3538
meson setup build/
3639
meson compile -C build/
3740
meson test -C build/ --suite=vs-templ

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
/.cache
1+
/.cache/
2+
/.venv/
23
/build/
34
/subprojects/*
45
!/subprojects/*.wrap
56
!/subprojects/packagefiles/
67
/wraps/cfltk
78
*.autogen.*
8-
/node_modules/
9-
/bun.lockb
109
/private
1110
/.vscode

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ bun run ./vs.templ.js [...]
8888
## Installation
8989

9090
Check the [Makefile](./Makefile). It will work out of the box on most systems.
91-
There are some flags you can configure without having to touch Meson directly in there.
91+
There are some flags in there you can configure without having to touch Meson directly.
9292

9393
## Projects using `vs.templ`
9494

docs/static-components.md

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)