Skip to content

Commit 3440d48

Browse files
committed
debian trixie build
1 parent edff72c commit 3440d48

File tree

5 files changed

+44
-10
lines changed

5 files changed

+44
-10
lines changed

.github/workflows/ci.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,32 @@ jobs:
124124
run: make config=asan
125125
- name: test
126126
run: make config=asan test
127+
##### lint #####
128+
lint:
129+
runs-on: ubuntu-latest
130+
container: debian:trixie
131+
name: lint
132+
env:
133+
linux_distro: debian
134+
linux_release: trixie
135+
steps:
136+
- name: add cppfw deb repo
137+
uses: myci-actions/add-deb-repo@main
138+
with:
139+
repo: deb https://gagis.hopto.org/repo/cppfw/${{ env.linux_distro }} ${{ env.linux_release }} main
140+
repo-name: cppfw
141+
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
142+
install: myci locales git devscripts equivs
143+
- name: git clone
144+
uses: myci-actions/checkout@main
145+
- name: prepare debian package
146+
run: myci-deb-prepare.sh
147+
- name: install deps
148+
run: myci-deb-install-build-deps.sh
149+
- name: build
150+
run: make config=lint
151+
- name: test
152+
run: make config=lint test
127153
##### linux #####
128154
linux:
129155
strategy:
@@ -141,6 +167,10 @@ jobs:
141167
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
142168
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
143169
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
170+
- {os: debian, codename: trixie, image_owner: }
171+
# - {os: debian, codename: trixie, image_owner: i386/, labels: [i386,docker]}
172+
- {os: debian, codename: trixie, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
173+
- {os: debian, codename: trixie, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
144174
# - {os: ubuntu, codename: focal, image_owner: }
145175
# - {os: ubuntu, codename: jammy, image_owner: }
146176
- {os: ubuntu, codename: noble, image_owner: }

.vscode/tasks.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"group": "build"
1414
},
1515
{
16-
"label": "build_dbg",
16+
"label": "build-dev",
1717
"type": "shell",
18-
"command": "make config=dbg",
18+
"command": "make config=dev",
1919
"problemMatcher": [
2020
"$gcc"
2121
],
@@ -30,18 +30,18 @@
3030
"group": "build"
3131
},
3232
{
33-
"label": "test_unit_dbg",
33+
"label": "test_unit-dev",
3434
"type": "shell",
35-
"command": "make test config=dbg -C tests/unit",
36-
"dependsOn": "build_dbg",
35+
"command": "make test config=dev -C tests/unit",
36+
"dependsOn": "build-dev",
3737
"problemMatcher": [],
3838
"group": "build"
3939
},
4040
{
41-
"label": "test_dbg",
41+
"label": "test-dev",
4242
"type": "shell",
43-
"command": "make test config=dbg",
44-
"dependsOn": "build_dbg",
43+
"command": "make test config=dev",
44+
"dependsOn": "build-dev",
4545
"problemMatcher": [],
4646
"group": "build"
4747
},

config/base/base.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ this_cxxflags += -g
1010

1111
this_ldlibs += -lstdc++
1212

13+
this_no_format_test := true
14+
1315
ifeq ($(gprof), true)
1416
this_cxxflags += -pg
1517
this_ldflags += -pg

config/lint.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
include $(config_dir)dev.mk
2+
3+
this_lint_cmd = $(prorab_lint_cmd_clang_tidy)
4+
this_no_format_test := false

config/rel.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ include $(config_dir)base/base.mk
22

33
this_cxxflags += -O3
44

5-
this_lint_cmd = $(prorab_lint_cmd_clang_tidy)
6-
75
# WORKAROUND: on ubuntu jammy dpkg-buildpackage passes -ffat-lto-objects compilation flag
86
# which is not supported by clang and clang-tidy complains about it:
97
# error: optimization flag '-ffat-lto-objects' is not supported [clang-diagnostic-ignored-optimization-argument]

0 commit comments

Comments
 (0)