Skip to content

Commit 209566c

Browse files
igagisigagis
committed
debian trixie build
1 parent be0895c commit 209566c

File tree

7 files changed

+78
-40
lines changed

7 files changed

+78
-40
lines changed

‎.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: }
91-
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
92-
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
90+
- {os: debian, codename: trixie, image_owner: }
91+
- {os: debian, codename: trixie, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
92+
- {os: debian, codename: trixie, image_owner: arm64v8/, 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 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:
@@ -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
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
@@ -392,13 +422,13 @@ jobs:
392422
# container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
393423
# name: conan - linux | ${{ matrix.labels[0] }}
394424
# steps:
395-
# - name: add llvm repo (for clang-format)
396-
# uses: myci-actions/add-deb-repo@main
397-
# with:
398-
# repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
399-
# repo-name: llvm
400-
# keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
401-
# install: clang-format clang-tidy
425+
# # - name: add llvm repo (for clang-format)
426+
# # uses: myci-actions/add-deb-repo@main
427+
# # with:
428+
# # repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
429+
# # repo-name: llvm
430+
# # keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
431+
# # install: clang-format clang-tidy
402432
# - name: add cppfw deb repo
403433
# uses: myci-actions/add-deb-repo@main
404434
# with:

‎.vscode/tasks.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"group": "build"
1414
},
1515
{
16-
"label": "make-dbg",
16+
"label": "make-dev",
1717
"type": "shell",
18-
"command": "make config=dbg",
18+
"command": "make config=dev",
1919
"problemMatcher": [
2020
"$gcc"
2121
],

‎build/conan/test_package/example.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#include <ruis/render/opengl/context.hpp>
22

3+
#include <iostream>
4+
35
int main(int argc, const char** argv){
46
auto c = utki::make_shared<ruis::render::opengl::context>();
57

68
std::cout << "hello ruis-render-opengl!" << std::endl;
79

810
return 0;
9-
}
11+
}

‎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 <ruis/render/opengl/context.hpp>
66

7+
#include <iostream>
8+
79
int main(int argc, const char** argv){
810
std::function<void()> f = [](){
911
ruis::render::opengl::context c;

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

0 commit comments

Comments
 (0)