Skip to content

Commit a71d165

Browse files
Merge pull request #44 from dreamer-coding/main
Patch update for Fossil Io
2 parents 813d71b + 8d3415b commit a71d165

File tree

10 files changed

+439
-126
lines changed

10 files changed

+439
-126
lines changed

.github/ciimage/Dockerfile.debian

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
1-
# Use a specific Debian base image
2-
FROM debian:buster
1+
# Use a specific Debian Bookworm base image
2+
FROM debian:bookworm
33

44
# Set environment variables to avoid interaction
55
ENV DEBIAN_FRONTEND=noninteractive \
66
TZ=UTC
77

88
# Install system dependencies and clean up
99
RUN apt-get update && \
10-
apt-get install -y \
10+
apt-get install -y --no-install-recommends \
1111
build-essential \
1212
clang \
1313
gcc \
1414
g++ \
1515
gdb \
1616
llvm \
17-
libstdc++-8-dev \
17+
libstdc++-12-dev \
1818
wget \
1919
python3 \
20+
python3-full \
2021
python3-pip \
21-
git && \
22+
git \
23+
ca-certificates && \
2224
apt-get clean && \
2325
rm -rf /var/lib/apt/lists/*
2426

25-
# Install Meson and Ninja
26-
RUN python3 -m pip install --no-cache-dir meson ninja==1.10.2
27+
# Install Meson and Ninja using pip
28+
RUN python3 -m pip install --no-cache-dir meson==1.3.0 ninja==1.10.2 --break-system-packages
2729

2830
# Set environment variables
29-
ENV CC=/usr/bin/clang
30-
ENV CXX=/usr/bin/clang++
31-
ENV LD_LIBRARY_PATH=/usr/local/lib
31+
ENV CC=clang \
32+
CXX=clang++ \
33+
LD_LIBRARY_PATH=/usr/local/lib
3234

3335
# Set working directory
3436
WORKDIR /workspace

.github/workflows/meson_ci.yml

Lines changed: 13 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@ on:
55
paths:
66
- "**.c"
77
- "**.h"
8-
- "**.cpp"
9-
- "**.hpp"
108
- "**.py"
119
- "**.build"
1210
- "**.options"
1311
pull_request:
1412
paths:
1513
- "**.c"
1614
- "**.h"
17-
- "**.cpp"
18-
- "**.hpp"
1915
- "**.py"
2016
- "**.build"
2117
- "**.options"
@@ -26,7 +22,7 @@ jobs:
2622
runs-on: windows-latest
2723
strategy:
2824
matrix:
29-
msvc_version: [2015, 2017, 2019, 2022]
25+
msvc_version: [2015, 2017, 2019, 2022, 2025]
3026
steps:
3127
- name: Checkout code
3228
uses: actions/checkout@v4
@@ -51,25 +47,17 @@ jobs:
5147
choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --includeOptional --passive"
5248
} elseif ($env:msvc_version -eq "2022") {
5349
choco install visualstudio2022buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --includeOptional --passive"
50+
} elseif ($env:msvc_version -eq "2025") {
51+
choco install visualstudio2025buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --includeOptional --passive"
5452
}
5553
$env:CC="cl.exe"
5654
$env:CXX="cl.exe"
5755
5856
- name: Configure
5957
run: meson setup builddir_msvc_${{ matrix.msvc_version }} --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
6058

61-
- name: Compile
62-
run: meson compile -C builddir_msvc_${{ matrix.msvc_version }}
63-
6459
- name: Run Tests
65-
run: meson test -C builddir_msvc_${{ matrix.msvc_version }} -v
66-
67-
- name: Upload Test Log
68-
if: failure()
69-
uses: actions/upload-artifact@v4
70-
with:
71-
name: windows_msvc_${{ matrix.msvc_version }}_meson_testlog
72-
path: builddir_msvc_${{ matrix.msvc_version }}/meson-logs/testlog.txt
60+
run: meson test -C builddir_msvc_${{ matrix.msvc_version }} -v --test-args='show --mode tree --verbose ci --result fail'
7361

7462
build_macosx:
7563
name: Building on macOS with Xcode ${{ matrix.xcode_version }}
@@ -98,18 +86,8 @@ jobs:
9886
- name: Configure
9987
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
10088

101-
- name: Compile
102-
run: meson compile -C builddir
103-
10489
- name: Run Tests
105-
run: meson test -C builddir -v
106-
107-
- name: Upload Test Log
108-
if: failure()
109-
uses: actions/upload-artifact@v4
110-
with:
111-
name: macos_xcode_${{ matrix.xcode_version }}_meson_testlog
112-
path: builddir/meson-logs/testlog.txt
90+
run: meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'
11391

11492
build_msys:
11593
name: Building on MSYS ${{ matrix.architecture }}
@@ -145,18 +123,8 @@ jobs:
145123
- name: Configure
146124
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
147125

148-
- name: Compile
149-
run: meson compile -C builddir
150-
151126
- name: Run Tests
152-
run: meson test -C builddir -v
153-
154-
- name: Upload Test Log
155-
if: failure()
156-
uses: actions/upload-artifact@v4
157-
with:
158-
name: msys_${{ matrix.architecture }}_meson_testlog
159-
path: builddir/meson-logs/testlog.txt
127+
run: meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'
160128

161129
build_mingw:
162130
name: Building on MinGW ${{ matrix.architecture }}
@@ -196,18 +164,8 @@ jobs:
196164
- name: Configure
197165
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
198166

199-
- name: Compile
200-
run: meson compile -C builddir
201-
202167
- name: Run Tests
203-
run: meson test -C builddir -v
204-
205-
- name: Upload Test Log
206-
if: failure()
207-
uses: actions/upload-artifact@v4
208-
with:
209-
name: mingw_${{ matrix.architecture }}_meson_testlog
210-
path: builddir/meson-logs/testlog.txt
168+
run: meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'
211169

212170
build_posix:
213171
name: Build on Linux ${{ matrix.distro }}
@@ -249,8 +207,7 @@ jobs:
249207
/bin/bash -c "
250208
sudo apt update
251209
meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
252-
meson compile -C builddir
253-
meson test -C builddir -v"
210+
meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'"
254211
255212
build_cross:
256213
name: Building on Bedrock ${{ matrix.architecture }}
@@ -344,4 +301,8 @@ jobs:
344301
345302
- name: Build the Project
346303
run: |
347-
meson compile -C builddir
304+
meson compile -C builddir
305+
306+
- name: Test the Project
307+
run: |
308+
meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ To get started with Fossil Io, ensure you have the following installed:
3737
# ======================
3838
[wrap-git]
3939
url = https://github.com/fossillogic/fossil-io.git
40-
revision = v0.2.1
40+
revision = v0.2.2
4141

4242
[provide]
4343
fossil-io = fossil_io_dep

0 commit comments

Comments
 (0)