Skip to content

Commit ae7fd10

Browse files
committed
conan: fix build
1 parent 7dddea3 commit ae7fd10

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

.github/workflows/ci.yml

+17-13
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ jobs:
6060
# - {os: debian, codename: buster, image_owner: }
6161
# - {os: debian, codename: buster, image_owner: i386/, labels: [i386,docker]}
6262
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm32,docker]}
63-
- {os: debian, codename: bullseye, image_owner: }
63+
# - {os: debian, codename: bullseye, image_owner: }
6464
# - {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]}
6767
- {os: debian, codename: bookworm, image_owner: }
6868
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
6969
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
7070
- {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: }
7373
- {os: ubuntu, codename: noble, image_owner: }
7474
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm32,docker]}
7575
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
@@ -288,13 +288,14 @@ jobs:
288288
fail-fast: false
289289
matrix:
290290
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]}
295296
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
296297
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
297-
name: conan - linux - ${{ matrix.arch }}
298+
name: conan - linux | ${{ matrix.labels[0] }}
298299
steps:
299300
- name: add llvm repo (for clang-format)
300301
uses: myci-actions/add-deb-repo@main
@@ -309,9 +310,12 @@ jobs:
309310
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
310311
repo-name: cppfw
311312
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"}
313317
- name: install conan
314-
run: pip3 --quiet install conan
318+
run: pipx install conan
315319
- name: create default conan profile
316320
run: |
317321
conan profile detect --name default
@@ -325,7 +329,7 @@ jobs:
325329
- name: build
326330
run: |
327331
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
329333
- name: deploy conan package
330334
run: |
331335
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER

0 commit comments

Comments
 (0)