Skip to content

Commit c20b5ce

Browse files
igagisigagis
committed
debian trixie build
1 parent 868ec0f commit c20b5ce

9 files changed

Lines changed: 82 additions & 44 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 65 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
##### coverage #####
1717
# coverage:
1818
# runs-on: ubuntu-latest
19-
# container: debian:bookworm
19+
# container: debian:trixie
2020
# name: coverage - measure
2121
# env:
2222
# linux_distro: debian
23-
# linux_release: bookworm
23+
# linux_release: trixie
2424
# steps:
2525
# - name: add cppfw deb repo
2626
# uses: myci-actions/add-deb-repo@main
@@ -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
@@ -87,9 +87,9 @@ jobs:
8787
fail-fast: false
8888
matrix:
8989
include:
90-
- {os: debian, codename: bookworm, image_owner: , package_type: deb}
91-
- {os: debian, codename: bookworm, image_owner: arm32v7/, package_type: deb, labels: [ubuntu-24.04-arm]}
92-
- {os: debian, codename: bookworm, image_owner: arm64v8/, package_type: deb, labels: [ubuntu-24.04-arm]}
90+
- {os: debian, codename: trixie, image_owner: , package_type: deb}
91+
- {os: debian, codename: trixie, image_owner: arm32v7/, package_type: deb, labels: [ubuntu-24.04-arm]}
92+
- {os: debian, codename: trixie, image_owner: arm64v8/, package_type: deb, labels: [ubuntu-24.04-arm]}
9393
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
9494
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
9595
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
@@ -101,12 +101,12 @@ jobs:
101101
repo-name: cppfw
102102
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
103103
install: myci git
104-
- name: add llvm repo (for clang-format)
105-
uses: myci-actions/add-deb-repo@main
106-
with:
107-
repo: deb https://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 https://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:
@@ -133,10 +159,14 @@ jobs:
133159
# - {os: debian, codename: bullseye, image_owner: , package_type: deb, labels: [i386,docker]}
134160
# - {os: debian, codename: bullseye, image_owner: , package_type: deb, labels: [arm32,docker]}
135161
# - {os: debian, codename: bullseye, image_owner: , package_type: deb, labels: [arm64,docker]}
136-
- {os: debian, codename: bookworm, image_owner: , package_type: deb}
137-
# - {os: debian, codename: bookworm, image_owner: , package_type: deb, labels: [i386,docker]}
138-
- {os: debian, codename: bookworm, image_owner: arm32v7/, package_type: deb, labels: [ubuntu-24.04-arm]}
139-
- {os: debian, codename: bookworm, image_owner: arm64v8/, package_type: deb, labels: [ubuntu-24.04-arm]}
162+
- {os: debian, codename: bookworm, image_owner: }
163+
# - {os: debian, codename: bookworm, image_owner: , labels: [i386,docker]}
164+
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
165+
- {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: , 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: , package_type: deb}
141171
# - {os: ubuntu, codename: jammy, image_owner: , package_type: deb}
142172
- {os: ubuntu, codename: noble, image_owner: , package_type: deb}
@@ -158,12 +188,12 @@ jobs:
158188
repo-name: cppfw
159189
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
160190
install: myci git devscripts equivs nodejs libwayland-dev
161-
- name: add llvm repo (for clang-format)
162-
uses: myci-actions/add-deb-repo@main
163-
with:
164-
repo: deb https://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 https://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
@@ -181,7 +211,7 @@ jobs:
181211
run: |
182212
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
183213
myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo cppfw/${{ matrix.os }} --distro ${{ matrix.codename }} --component main lib${PACKAGE_NAME}*_${PACKAGE_VERSION}_*.*deb
184-
if: matrix.package_type == 'deb' && startsWith(github.ref, 'refs/tags/')
214+
if: startsWith(github.ref, 'refs/tags/')
185215
##### macosx #####
186216
macosx:
187217
runs-on: macos-latest
@@ -489,13 +519,13 @@ jobs:
489519
# container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
490520
# name: conan - linux | ${{ matrix.image_owner }}
491521
# steps:
492-
# - name: add llvm repo (for clang-format)
493-
# uses: myci-actions/add-deb-repo@main
494-
# with:
495-
# repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
496-
# repo-name: llvm
497-
# keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
498-
# install: clang-format clang-tidy
522+
# # - name: add llvm repo (for clang-format)
523+
# # uses: myci-actions/add-deb-repo@main
524+
# # with:
525+
# # repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
526+
# # repo-name: llvm
527+
# # keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
528+
# # install: clang-format clang-tidy
499529
# - name: add cppfw deb repo
500530
# uses: myci-actions/add-deb-repo@main
501531
# with:

‎.vscode/tasks.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"group": "build"
1414
},
1515
{
16-
"label": "build_dev",
16+
"label": "build-dev",
1717
"type": "shell",
1818
"command": "make config=dev",
1919
"problemMatcher": [
@@ -29,7 +29,7 @@
2929
"group": "build"
3030
},
3131
{
32-
"label": "clean_dev",
32+
"label": "clean-dev",
3333
"type": "shell",
3434
"command": "make clean config=dev",
3535
"problemMatcher": [],
@@ -83,7 +83,7 @@
8383
"type": "shell",
8484
"command": "make test config=dev",
8585
"problemMatcher": [],
86-
"dependsOn": "build_dev",
86+
"dependsOn": "build-dev",
8787
"group": "build"
8888
},
8989
{

‎build/conan/test_package/example.cpp‎

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

3+
#include <iostream>
4+
35
const ruisapp::application_factory app_fac([](auto executable, auto args){
46

57
std::cout << "Hello ruisapp!" << std::endl;

‎build/vcpkg/test/main.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
#include <ruisapp/application.hpp>
66

7+
#include <iostream>
8+
79
namespace{
810
ruisapp::application_factory appfac(
911
[](std::string_view executable, utki::span<std::string_view> args) -> std::unique_ptr<ruisapp::application> {

‎config/base/base.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ this_cxxflags += -fPIC
99
this_cxxflags += -Wno-deprecated-declarations
1010

1111
this_ldlibs += -lstdc++
12+
13+
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]

‎tests/app/src/vertical_list_window.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ utki::shared_ref<ruis::window> make_vertical_list_window(
6565
.widget_params{
6666
.id = "list"s
6767
},
68-
.providable_params{
68+
.list_params{
6969
.provider = [&c](){
7070
class the_provider : public ruis::list_provider{
7171
std::vector<std::u32string> items;
@@ -131,7 +131,7 @@ utki::shared_ref<ruis::window> make_vertical_list_window(
131131
}
132132
}
133133
};
134-
return std::make_shared<the_provider>(c);
134+
return utki::make_shared<the_provider>(c);
135135
}()
136136
}
137137
}

‎tests/app/src/window1.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ utki::shared_ref<ruis::window> make_window1(
153153
.oriented_params{
154154
.vertical = false
155155
},
156-
.providable_params{
156+
.list_params{
157157
.provider = [&c](){
158158
class the_provider : public ruis::list_provider{
159159
std::vector<std::u32string> items;
@@ -194,7 +194,7 @@ utki::shared_ref<ruis::window> make_window1(
194194
);
195195
}
196196
};
197-
return std::make_shared<the_provider>(c);
197+
return utki::make_shared<the_provider>(c);
198198
}()
199199
}
200200
}

0 commit comments

Comments
 (0)