Skip to content

Commit ea60263

Browse files
igagisigagis
committed
debian trixie build
1 parent 3604ab5 commit ea60263

File tree

9 files changed

+80
-44
lines changed

9 files changed

+80
-44
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 55 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
repo-name: cppfw
3030
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
3131
install: myci locales git pipx
32-
- name: add llvm repo (for clang-format)
33-
uses: myci-actions/add-deb-repo@main
34-
with:
35-
repo: deb http://apt.llvm.org/${{ env.linux_release }} llvm-toolchain-${{ env.linux_release }} main
36-
repo-name: llvm
37-
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
32+
# - name: add llvm repo (for clang-format)
33+
# uses: myci-actions/add-deb-repo@main
34+
# with:
35+
# repo: deb http://apt.llvm.org/${{ env.linux_release }} llvm-toolchain-${{ env.linux_release }} main
36+
# repo-name: llvm
37+
# keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
3838
- name: git clone
3939
uses: myci-actions/checkout@main
4040
- name: prepare debian package
@@ -101,12 +101,12 @@ jobs:
101101
repo-name: cppfw
102102
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
103103
install: myci git python3-pip
104-
- name: add llvm repo (for clang-format)
105-
uses: myci-actions/add-deb-repo@main
106-
with:
107-
repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
108-
repo-name: llvm
109-
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
104+
# - name: add llvm repo (for clang-format)
105+
# uses: myci-actions/add-deb-repo@main
106+
# with:
107+
# repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
108+
# repo-name: llvm
109+
# keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
110110
- name: install ci tools
111111
run: |
112112
apt install --assume-yes devscripts equivs
@@ -120,6 +120,32 @@ jobs:
120120
run: make config=asan
121121
- name: test
122122
run: make config=asan test
123+
##### lint #####
124+
lint:
125+
runs-on: ubuntu-latest
126+
container: debian:trixie
127+
name: lint
128+
env:
129+
linux_distro: debian
130+
linux_release: trixie
131+
steps:
132+
- name: add cppfw deb repo
133+
uses: myci-actions/add-deb-repo@main
134+
with:
135+
repo: deb https://gagis.hopto.org/repo/cppfw/${{ env.linux_distro }} ${{ env.linux_release }} main
136+
repo-name: cppfw
137+
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
138+
install: myci locales git devscripts equivs
139+
- name: git clone
140+
uses: myci-actions/checkout@main
141+
- name: prepare debian package
142+
run: myci-deb-prepare.sh
143+
- name: install deps
144+
run: myci-deb-install-build-deps.sh
145+
- name: build
146+
run: make config=lint
147+
- name: test
148+
run: make config=lint test
123149
##### deb linux #####
124150
deb:
125151
strategy:
@@ -137,6 +163,10 @@ jobs:
137163
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
138164
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
139165
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
166+
- {os: debian, codename: trixie, image_owner: }
167+
# - {os: debian, codename: trixie, image_owner: i386/, labels: [i386,docker]}
168+
- {os: debian, codename: trixie, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
169+
- {os: debian, codename: trixie, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
140170
# - {os: ubuntu, codename: focal, image_owner: }
141171
# - {os: ubuntu, codename: jammy, image_owner: }
142172
- {os: ubuntu, codename: noble, image_owner: }
@@ -158,12 +188,12 @@ jobs:
158188
repo-name: cppfw
159189
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
160190
install: myci git python3-pip devscripts equivs
161-
- name: add llvm repo (for clang-format)
162-
uses: myci-actions/add-deb-repo@main
163-
with:
164-
repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
165-
repo-name: llvm
166-
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
191+
# - name: add llvm repo (for clang-format)
192+
# uses: myci-actions/add-deb-repo@main
193+
# with:
194+
# repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
195+
# repo-name: llvm
196+
# keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
167197
- name: git clone
168198
uses: myci-actions/checkout@main
169199
- name: set PACKAGE_VERSION
@@ -539,13 +569,13 @@ jobs:
539569
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
540570
name: conan - linux | ${{ matrix.image_owner }}
541571
steps:
542-
- name: add llvm repo (for clang-format)
543-
uses: myci-actions/add-deb-repo@main
544-
with:
545-
repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
546-
repo-name: llvm
547-
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
548-
install: clang-format clang-tidy
572+
# - name: add llvm repo (for clang-format)
573+
# uses: myci-actions/add-deb-repo@main
574+
# with:
575+
# repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
576+
# repo-name: llvm
577+
# keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
578+
# install: clang-format clang-tidy
549579
- name: add cppfw deb repo
550580
uses: myci-actions/add-deb-repo@main
551581
with:

‎.vscode/tasks.json‎

Lines changed: 6 additions & 6 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
],
@@ -44,17 +44,17 @@
4444
"group": "build"
4545
},
4646
{
47-
"label": "test_dbg",
47+
"label": "test-dev",
4848
"type": "shell",
49-
"command": "make test config=dbg",
50-
"dependsOn": "build_dbg",
49+
"command": "make test config=dev",
50+
"dependsOn": "build-dev",
5151
"problemMatcher": [],
5252
"group": "build"
5353
},
5454
{
5555
"label": "format",
5656
"type": "shell",
57-
"command": "make apply-format",
57+
"command": "make format",
5858
"problemMatcher": [],
5959
"group": "build"
6060
}

‎build/vcpkg/test/main.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include <cssom/om.hpp>
22

3+
#include <iostream>
4+
35
int main(int argc, const char** argv){
46
cssom::sheet css;
57

‎config/base/base.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ this_cxxflags += -std=c++17
88
this_cxxflags += -fPIC
99

1010
this_ldlibs += -lstdc++
11+
12+
this_no_format_test := true

‎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]

‎src/cssom/om.cpp‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -301,16 +301,14 @@ std::vector<std::pair<std::string, std::shared_ptr<std::string>>> to_string_styl
301301
ASSERT(props_ptr)
302302
auto props_iter = props_map.find(props_ptr);
303303
if (props_iter == props_map.end()) {
304-
auto res = props_map.insert(
305-
std::make_pair(
306-
props_ptr,
307-
std::make_shared<std::string>(to_string(
308-
*s.properties, //
309-
property_id_to_name,
310-
property_value_to_string
311-
))
312-
)
313-
);
304+
auto res = props_map.insert(std::make_pair(
305+
props_ptr,
306+
std::make_shared<std::string>(to_string(
307+
*s.properties, //
308+
property_id_to_name,
309+
property_value_to_string
310+
))
311+
));
314312
ASSERT(res.second)
315313
props_iter = res.first;
316314
}

‎tests/unit/samples.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include <iostream>
2+
13
#include <tst/set.hpp>
24
#include <tst/check.hpp>
35

‎tool-configs‎

0 commit comments

Comments
 (0)