Skip to content

Commit 72c9382

Browse files
committed
debian trixie build
1 parent d9a7eee commit 72c9382

File tree

6 files changed

+44
-10
lines changed

6 files changed

+44
-10
lines changed

.github/workflows/ci.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,32 @@ jobs:
119119
run: make config=asan
120120
- name: test
121121
run: make config=asan test
122+
##### lint #####
123+
lint:
124+
runs-on: ubuntu-latest
125+
container: debian:trixie
126+
name: lint
127+
env:
128+
linux_distro: debian
129+
linux_release: trixie
130+
steps:
131+
- name: add cppfw deb repo
132+
uses: myci-actions/add-deb-repo@main
133+
with:
134+
repo: deb https://gagis.hopto.org/repo/cppfw/${{ env.linux_distro }} ${{ env.linux_release }} main
135+
repo-name: cppfw
136+
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
137+
install: myci locales git devscripts equivs
138+
- name: git clone
139+
uses: myci-actions/checkout@main
140+
- name: prepare debian package
141+
run: myci-deb-prepare.sh
142+
- name: install deps
143+
run: myci-deb-install-build-deps.sh
144+
- name: build
145+
run: make config=lint
146+
- name: test
147+
run: make config=lint test
122148
##### deb linux #####
123149
deb:
124150
strategy:
@@ -136,6 +162,10 @@ jobs:
136162
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
137163
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
138164
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
165+
- {os: debian, codename: trixie, image_owner: }
166+
# - {os: debian, codename: trixie, image_owner: i386/, labels: [i386,docker]}
167+
- {os: debian, codename: trixie, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
168+
- {os: debian, codename: trixie, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
139169
# - {os: ubuntu, codename: focal, image_owner: }
140170
# - {os: ubuntu, codename: jammy, image_owner: }
141171
- {os: ubuntu, codename: noble, image_owner: }

.vscode/tasks.json

Lines changed: 7 additions & 7 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
],
@@ -29,9 +29,9 @@
2929
"group":"build"
3030
},
3131
{
32-
"label": "clean-dbg",
32+
"label": "clean-dev",
3333
"type": "shell",
34-
"command": "make clean config=dbg",
34+
"command": "make clean config=dev",
3535
"problemMatcher": [],
3636
"group":"build"
3737
},
@@ -44,11 +44,11 @@
4444
"group": "build"
4545
},
4646
{
47-
"label": "test-dbg",
47+
"label": "test-dev",
4848
"type": "shell",
49-
"command": "make test config=dbg",
49+
"command": "make test config=dev",
5050
"problemMatcher": [],
51-
"dependsOn": "build-dbg",
51+
"dependsOn": "build-dev",
5252
"group": "build"
5353
},
5454
{

config/base/base.mk

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

1313
this_ldlibs += -lstdc++
1414

15+
this_no_format_test := true
16+
1517
ifeq ($(gprof), true)
1618
this_cxxflags += -pg
1719
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]

tool-configs

0 commit comments

Comments
 (0)