Skip to content

Commit 4880648

Browse files
igagisigagis
committed
debian trixie build
1 parent 55cb10c commit 4880648

File tree

8 files changed

+142
-105
lines changed

8 files changed

+142
-105
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 60 additions & 30 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 }} | ${{ matrix.labels[0] }}
@@ -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:
@@ -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 devscripts equivs nodejs
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
@@ -538,13 +568,13 @@ jobs:
538568
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
539569
name: conan - linux | ${{ matrix.image_owner }}
540570
steps:
541-
- name: add llvm repo (for clang-format)
542-
uses: myci-actions/add-deb-repo@main
543-
with:
544-
repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
545-
repo-name: llvm
546-
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
547-
install: clang-format clang-tidy
571+
# - name: add llvm repo (for clang-format)
572+
# uses: myci-actions/add-deb-repo@main
573+
# with:
574+
# repo: deb http://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
575+
# repo-name: llvm
576+
# keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
577+
# install: clang-format clang-tidy
548578
- name: add cppfw deb repo
549579
uses: myci-actions/add-deb-repo@main
550580
with:

0 commit comments

Comments
 (0)