Skip to content

Commit e99646f

Browse files
igagisigagis
committed
master -> main
1 parent ac67547 commit e99646f

File tree

2 files changed

+45
-150
lines changed

2 files changed

+45
-150
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 44 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,27 @@ jobs:
1616
##### coverage #####
1717
coverage:
1818
runs-on: ubuntu-latest
19-
container: debian:bullseye
19+
container: debian:bookworm
2020
name: coverage - measure
2121
env:
2222
linux_distro: debian
23-
linux_release: bullseye
23+
linux_release: bookworm
2424
steps:
2525
- name: add cppfw deb repo
26-
uses: myci-actions/add-deb-repo@master
26+
uses: myci-actions/add-deb-repo@main
2727
with:
2828
repo: deb https://gagis.hopto.org/repo/cppfw/${{ env.linux_distro }} ${{ env.linux_release }} main
2929
repo-name: cppfw
3030
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
31-
install: myci locales git
31+
install: myci locales git pipx
3232
- name: add llvm repo (for clang-format)
33-
uses: myci-actions/add-deb-repo@master
33+
uses: myci-actions/add-deb-repo@main
3434
with:
3535
repo: deb https://apt.llvm.org/${{ env.linux_release }} llvm-toolchain-${{ env.linux_release }} main
3636
repo-name: llvm
3737
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
38-
- name: install ci tools
39-
run: |
40-
apt --quiet install --assume-yes devscripts equivs python3-pip
41-
42-
# install gcovr >5.2
43-
pip install git+https://github.com/gcovr/gcovr.git
4438
- name: git clone
45-
uses: myci-actions/checkout@master
39+
uses: myci-actions/checkout@main
4640
- name: prepare debian package
4741
run: myci-deb-prepare.sh
4842
- name: install deps
@@ -57,12 +51,12 @@ jobs:
5751
- name: test
5852
run: make config=gcov test
5953
- name: generate coverage report
60-
run: gcovr --exclude-throw-branches --filter src/ --cobertura > cobertura.xml
61-
- name: upload coverage report to artifacts
62-
uses: actions/upload-artifact@v3
63-
with:
64-
name: cobertura.xml
65-
path: cobertura.xml
54+
run: pipx run gcovr --exclude-throw-branches --filter src/ --cobertura > cobertura.xml
55+
# - name: upload coverage report to artifacts
56+
# uses: actions/upload-artifact@v4
57+
# with:
58+
# name: cobertura.xml
59+
# path: cobertura.xml
6660
- name: upload coverage data to codecov.io
6761
uses: codecov/codecov-action@v4
6862
if: always() # even if previous steps fail, this one needs to be run
@@ -79,21 +73,21 @@ jobs:
7973
fail-fast: false
8074
matrix:
8175
include:
82-
- {os: debian, codename: bullseye, image_owner: , package_type: deb}
83-
- {os: debian, codename: bullseye, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
76+
- {os: debian, codename: bookworm, image_owner: , package_type: deb}
77+
- {os: debian, codename: bookworm, image_owner: arm32v7/, package_type: deb, labels: [arm32,docker]}
8478
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
8579
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
8680
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
8781
steps:
8882
- name: add cppfw deb repo
89-
uses: myci-actions/add-deb-repo@master
83+
uses: myci-actions/add-deb-repo@main
9084
with:
9185
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
9286
repo-name: cppfw
9387
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
9488
install: myci locales git
9589
- name: add llvm repo (for clang-format)
96-
uses: myci-actions/add-deb-repo@master
90+
uses: myci-actions/add-deb-repo@main
9791
with:
9892
repo: deb https://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
9993
repo-name: llvm
@@ -102,7 +96,7 @@ jobs:
10296
run: |
10397
apt --quiet install --assume-yes devscripts equivs
10498
- name: git clone
105-
uses: myci-actions/checkout@master
99+
uses: myci-actions/checkout@main
106100
- name: prepare debian package
107101
run: myci-deb-prepare.sh
108102
- name: install deps
@@ -125,19 +119,20 @@ jobs:
125119
# - {os: debian, codename: buster, image_owner: , package_type: deb}
126120
# - {os: debian, codename: buster, image_owner: i386/, package_type: deb, labels: [i386,docker]}
127121
# - {os: debian, codename: buster, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
128-
- {os: debian, codename: bullseye, image_owner: , package_type: deb}
122+
# - {os: debian, codename: bullseye, image_owner: , package_type: deb}
129123
# - {os: debian, codename: bullseye, image_owner: i386/, package_type: deb, labels: [i386,docker]}
130-
- {os: debian, codename: bullseye, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
131-
- {os: debian, codename: bullseye, image_owner: arm64v8/, package_type: deb, labels: [arm64,docker]}
124+
# - {os: debian, codename: bullseye, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
125+
# - {os: debian, codename: bullseye, image_owner: arm64v8/, package_type: deb, labels: [arm64,docker]}
132126
- {os: debian, codename: bookworm, image_owner: , package_type: deb}
133127
# - {os: debian, codename: bookworm, image_owner: i386/, package_type: deb, labels: [i386,docker]}
134-
- {os: debian, codename: bookworm, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
128+
- {os: debian, codename: bookworm, image_owner: arm32v7/, package_type: deb, labels: [arm32,docker]}
135129
- {os: debian, codename: bookworm, image_owner: arm64v8/, package_type: deb, labels: [arm64,docker]}
136130
# - {os: ubuntu, codename: focal, image_owner: , package_type: deb}
137-
- {os: ubuntu, codename: jammy, image_owner: , package_type: deb}
131+
# - {os: ubuntu, codename: jammy, image_owner: , package_type: deb}
132+
- {os: ubuntu, codename: noble, image_owner: , package_type: deb}
138133
# - {os: raspbian, codename: buster, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
139-
- {os: raspbian, codename: bullseye, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
140-
- {os: raspbian, codename: bookworm, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
134+
# - {os: raspbian, codename: bullseye, image_owner: igagis/, package_type: deb, labels: [arm32,docker]}
135+
- {os: raspbian, codename: bookworm, image_owner: igagis/, package_type: deb, labels: [arm32,docker]}
141136
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
142137
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
143138
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
@@ -147,22 +142,22 @@ jobs:
147142
# configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal)
148143
TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
149144
- name: add cppfw deb repo
150-
uses: myci-actions/add-deb-repo@master
145+
uses: myci-actions/add-deb-repo@main
151146
with:
152147
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
153148
repo-name: cppfw
154149
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
155150
install: myci locales git devscripts equivs
156151
- name: add llvm repo (for clang-format)
157-
uses: myci-actions/add-deb-repo@master
152+
uses: myci-actions/add-deb-repo@main
158153
with:
159154
repo: deb https://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
160155
repo-name: llvm
161156
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
162157
- name: git clone
163-
uses: myci-actions/checkout@master
158+
uses: myci-actions/checkout@main
164159
- name: set PACKAGE_VERSION
165-
uses: myci-actions/export-env-var@master
160+
uses: myci-actions/export-env-var@main
166161
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
167162
- name: prepare debian package
168163
run: myci-deb-prepare.sh
@@ -201,7 +196,7 @@ jobs:
201196
rm -rf /usr/local/bin/python3*
202197
rm -rf /usr/local/bin/python3*-config
203198
- name: git clone
204-
uses: myci-actions/checkout@master
199+
uses: myci-actions/checkout@main
205200
- name: install clang-tidy and clang-format
206201
run: |
207202
brew install llvm
@@ -215,16 +210,16 @@ jobs:
215210
- name: install ci tools
216211
run: brew install myci make
217212
- name: set PATH to use latest make
218-
uses: myci-actions/export-env-var@master
213+
uses: myci-actions/export-env-var@main
219214
with: {name: PATH, value: "$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$PATH"}
220215
- name: set CFLAGS
221-
uses: myci-actions/export-env-var@master
216+
uses: myci-actions/export-env-var@main
222217
with: {name: CFLAGS, value: "-isystem $HOMEBREW_PREFIX/include $CFLAGS"}
223218
- name: set CXXFLAGS
224-
uses: myci-actions/export-env-var@master
219+
uses: myci-actions/export-env-var@main
225220
with: {name: CXXFLAGS, value: "-isystem $HOMEBREW_PREFIX/include $CXXFLAGS"}
226221
- name: set LDFLAGS
227-
uses: myci-actions/export-env-var@master
222+
uses: myci-actions/export-env-var@main
228223
with: {name: LDFLAGS, value: "-L $HOMEBREW_PREFIX/lib $LDFLAGS"}
229224
- name: install deps
230225
run: myci-brew-install.sh `myci-list-deps-homebrew.sh`
@@ -246,9 +241,9 @@ jobs:
246241
# - name: install ci tools
247242
# run: brew install myci
248243
# - name: git clone
249-
# uses: myci-actions/checkout@master
244+
# uses: myci-actions/checkout@main
250245
# - name: set PACKAGE_VERSION
251-
# uses: myci-actions/export-env-var@master
246+
# uses: myci-actions/export-env-var@main
252247
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
253248
# - name: add cocoapods repo
254249
# run: pod repo add --silent cppfw https://$MYCI_GIT_USERNAME@github.com/cppfw/cocoapods-repo.git
@@ -283,16 +278,16 @@ jobs:
283278
# container: mingc/android-build-box:latest
284279
# steps:
285280
# - name: git clone
286-
# uses: myci-actions/checkout@master
281+
# uses: myci-actions/checkout@main
287282
# - name: add cppfw deb repo
288-
# uses: myci-actions/add-deb-repo@master
283+
# uses: myci-actions/add-deb-repo@main
289284
# with:
290285
# repo: deb https://gagis.hopto.org/repo/cppfw/$(lsb_release --id --short | tr '[:upper:]' '[:lower:]') $(lsb_release --codename --short) main
291286
# repo-name: cppfw
292287
# keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
293288
# install: myci
294289
# - name: set PACKAGE_VERSION
295-
# uses: myci-actions/export-env-var@master
290+
# uses: myci-actions/export-env-var@main
296291
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
297292
# - name: build
298293
# run: |
@@ -326,22 +321,22 @@ jobs:
326321
msys2-devel
327322
mingw-w64-${{ matrix.arch }}-toolchain
328323
- name: add cppfw pacman msys repo
329-
uses: myci-actions/add-pacman-repo@master
324+
uses: myci-actions/add-pacman-repo@main
330325
with:
331326
name: cppfw_msys
332327
url: https://gagis.hopto.org/repo/cppfw/msys2/msys
333328
shell: 'msys2 {0}'
334329
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
335330
install: myci
336331
- name: add cppfw pacman msys/mingw repo
337-
uses: myci-actions/add-pacman-repo@master
332+
uses: myci-actions/add-pacman-repo@main
338333
with:
339334
name: cppfw_${{ matrix.repo }}
340335
url: https://gagis.hopto.org/repo/cppfw/msys2/${{ matrix.repo }}
341336
shell: 'msys2 {0}'
342337
key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
343338
- name: git clone
344-
uses: myci-actions/checkout@master
339+
uses: myci-actions/checkout@main
345340
- name: prepare pacman package
346341
run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
347342
- name: build
@@ -368,7 +363,7 @@ jobs:
368363
# uses: actions/checkout@v3
369364
# with: {submodules: true}
370365
# - name: install CoAPP tools
371-
# uses: myci-actions/install-coapp-tools@master
366+
# uses: myci-actions/install-coapp-tools@main
372367
# - name: nuget update
373368
# run: |
374369
# nuget restore msvs_solution/msvs_solution.sln
@@ -378,108 +373,8 @@ jobs:
378373
# - name: build
379374
# run: .\nuget\build_nuget.ps1
380375
# - name: deploy
381-
# uses: myci-actions/publish-nuget@master
376+
# uses: myci-actions/publish-nuget@main
382377
# with:
383378
# filename: '.\nuget\*.nupkg'
384379
# api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}
385380
# if: startsWith(github.ref, 'refs/tags/')
386-
##### conan - linux #####
387-
# conan-linux:
388-
# strategy:
389-
# fail-fast: false
390-
# matrix:
391-
# include:
392-
# - {os: ubuntu, codename: jammy, image_owner: , arch: x86_64}
393-
# # - {os: debian, codename: bullseye, image_owner: , arch: x86_64}
394-
# # - {os: debian, codename: bullseye, image_owner: i386/, arch: x86, labels: [i386,docker]}
395-
# - {os: debian, codename: bullseye, image_owner: arm32v7/, arch: armhf, labels: [arm,docker]}
396-
# runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
397-
# container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
398-
# name: conan - linux - ${{ matrix.arch }}
399-
# steps:
400-
# - name: add llvm repo (for clang-format)
401-
# uses: myci-actions/add-deb-repo@master
402-
# with:
403-
# repo: deb https://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main
404-
# repo-name: llvm
405-
# keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
406-
# install: clang-format clang-tidy
407-
# - name: add cppfw deb repo
408-
# uses: myci-actions/add-deb-repo@master
409-
# with:
410-
# repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
411-
# repo-name: cppfw
412-
# keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
413-
# install: devscripts equivs myci prorab prorab-extra python3-pip cmake git
414-
# - name: install conan
415-
# run: pip3 --quiet install conan
416-
# - name: create default conan profile
417-
# run: |
418-
# conan profile detect --name default
419-
# sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
420-
# - name: git clone
421-
# uses: myci-actions/checkout@master
422-
# with:
423-
# submodules: false
424-
# - name: set PACKAGE_VERSION
425-
# uses: myci-actions/export-env-var@master
426-
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
427-
# if: startsWith(github.ref, 'refs/tags/')
428-
# - name: build
429-
# run: |
430-
# conan remote add cppfw $MYCI_CONAN_REMOTE
431-
# conan create conan --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
432-
# - name: deploy conan package
433-
# run: |
434-
# conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
435-
# conan upload --check --remote cppfw $PACKAGE_NAME/$PACKAGE_VERSION@$MYCI_CONAN_USER/main
436-
# if: startsWith(github.ref, 'refs/tags/')
437-
##### conan - macosx #####
438-
# conan-macosx:
439-
# strategy:
440-
# fail-fast: false
441-
# matrix:
442-
# os:
443-
# # - macos-10.15
444-
# - macos-11
445-
# - macos-12
446-
# name: conan - ${{ matrix.os }}
447-
# runs-on: ${{ matrix.os }}
448-
# steps:
449-
# - name: git clone
450-
# uses: myci-actions/checkout@master
451-
# with:
452-
# submodules: false
453-
# - name: install clang-tidy and clang-format
454-
# run: |
455-
# brew install llvm
456-
# ln -s "$(brew --prefix llvm)/bin/clang-format" "/usr/local/bin/clang-format"
457-
# ln -s "$(brew --prefix llvm)/bin/clang-tidy" "/usr/local/bin/clang-tidy"
458-
# ln -s "$(brew --prefix llvm)/bin/clang-apply-replacements" "/usr/local/bin/clang-apply-replacements"
459-
# - name: add cppfw tap
460-
# run: |
461-
# brew tap cppfw/tap
462-
# brew update
463-
# # NOTE: the preinstalled make is old and sometimes crashes, so install latest make
464-
# - name: install ci tools
465-
# run: brew install myci prorab prorab-extra conan make
466-
# - name: create default conan profile
467-
# run: |
468-
# conan profile detect --name default
469-
# sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
470-
# - name: set PATH to use latest make
471-
# uses: myci-actions/export-env-var@master
472-
# with: {name: PATH, value: "/usr/local/opt/make/libexec/gnubin:$PATH"}
473-
# - name: set PACKAGE_VERSION
474-
# uses: myci-actions/export-env-var@master
475-
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
476-
# if: startsWith(github.ref, 'refs/tags/')
477-
# - name: build
478-
# run: |
479-
# conan remote add cppfw $MYCI_CONAN_REMOTE
480-
# conan create conan --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
481-
# - name: deploy conan package
482-
# run: |
483-
# conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
484-
# conan upload --check --remote cppfw $PACKAGE_NAME/$PACKAGE_VERSION@$MYCI_CONAN_USER/main
485-
# if: startsWith(github.ref, 'refs/tags/')

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "tool-configs"]
22
path = tool-configs
33
url = ../../cppfw/tool-configs
4-
branch = master
4+
branch = main

0 commit comments

Comments
 (0)