@@ -60,16 +60,16 @@ jobs:
60
60
# - {os: debian, codename: buster, image_owner: }
61
61
# - {os: debian, codename: buster, image_owner: i386/, labels: [i386,docker]}
62
62
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm32,docker]}
63
- - {os: debian, codename: bullseye, image_owner: }
63
+ # - {os: debian, codename: bullseye, image_owner: }
64
64
# - {os: debian, codename: bullseye, image_owner: i386/, labels: [i386,docker]}
65
- - {os: debian, codename: bullseye, image_owner: , labels: [arm32,docker]}
66
- - {os: debian, codename: bullseye, image_owner: , labels: [arm64,docker]}
65
+ # - {os: debian, codename: bullseye, image_owner: , labels: [arm32,docker]}
66
+ # - {os: debian, codename: bullseye, image_owner: , labels: [arm64,docker]}
67
67
- {os: debian, codename: bookworm, image_owner: }
68
68
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
69
69
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
70
70
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
71
- - {os: ubuntu, codename: focal, image_owner: }
72
- - {os: ubuntu, codename: jammy, image_owner: }
71
+ # - {os: ubuntu, codename: focal, image_owner: }
72
+ # - {os: ubuntu, codename: jammy, image_owner: }
73
73
- {os: ubuntu, codename: noble, image_owner: }
74
74
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm32,docker]}
75
75
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
@@ -288,13 +288,14 @@ jobs:
288
288
fail-fast : false
289
289
matrix :
290
290
include :
291
- - {os: ubuntu, codename: jammy, image_owner: , arch: x86_64}
292
- # - {os: debian, codename: bullseye, image_owner: , arch: x86_64}
293
- # - {os: debian, codename: bullseye, image_owner: i386/, arch: x86, labels: [i386,docker]}
294
- - {os: debian, codename: bullseye, image_owner: arm32v7/, arch: armhf, labels: [arm,docker]}
291
+ - {os: ubuntu, codename: noble, image_owner: }
292
+ - {os: debian, codename: bookworm, image_owner: }
293
+ # - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
294
+ - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
295
+ - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
295
296
runs-on : ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
296
297
container : ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
297
- name : conan - linux - ${{ matrix.arch }}
298
+ name : conan - linux | ${{ matrix.labels[0] }}
298
299
steps :
299
300
- name : add llvm repo (for clang-format)
300
301
uses : myci-actions/add-deb-repo@main
@@ -309,9 +310,12 @@ jobs:
309
310
repo : deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
310
311
repo-name : cppfw
311
312
keys-asc : https://gagis.hopto.org/repo/cppfw/pubkey.gpg
312
- install : devscripts equivs myci prorab prorab-extra python3-pip cmake git
313
+ install : devscripts equivs myci prorab prorab-extra pipx cmake git
314
+ - name : add ~/.local/bin to PATH
315
+ uses : myci-actions/export-env-var@main
316
+ with : {name: PATH, value: "$PATH:$HOME/.local/bin"}
313
317
- name : install conan
314
- run : pip3 --quiet install conan
318
+ run : pipx install conan
315
319
- name : create default conan profile
316
320
run : |
317
321
conan profile detect --name default
@@ -325,7 +329,7 @@ jobs:
325
329
- name : build
326
330
run : |
327
331
conan remote add cppfw $MYCI_CONAN_REMOTE
328
- conan create conan --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
332
+ conan create conan --build=missing -- user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
329
333
- name : deploy conan package
330
334
run : |
331
335
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
0 commit comments