conan: fix

cppfw · Nov 17, 2024 · 21475c9 · 21475c9
1 parent 3cb8104
commit 21475c9
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -420,19 +420,17 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
 ##### conan - linux #####
   conan-linux:
-    # TODO: remove comment
-    # if: ${{ false }}  # disable until libpng is updated
     strategy:
       fail-fast: false
       matrix:
         include:
-          - {os: ubuntu, codename: jammy, image_owner: , arch: x86_64}
-          # - {os: debian, codename: bullseye, image_owner: , arch: x86_64}
-          # - {os: debian, codename: bullseye, image_owner: i386/, arch: x86, labels: [i386,docker]}
-          # - {os: debian, codename: bullseye, image_owner: arm32v7/, arch: armhf, labels: [arm32,docker]}
+          - {os: debian, codename: bookworm, image_owner: }
+          # - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
+          # - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
+          - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
     container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
-    name: conan - linux - ${{ matrix.arch }}
+    name: conan - linux | ${{ matrix.labels[0] }}
     steps:
       - name: add llvm repo (for clang-format)
         uses: myci-actions/add-deb-repo@main
@@ -447,9 +445,12 @@ jobs:
           repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
           repo-name: cppfw
           keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
-          install: devscripts equivs myci prorab prorab-extra python3-pip cmake git libx11-dev
+          install: devscripts equivs myci prorab prorab-extra pipx cmake git libx11-dev
+      - name: add ~/.local/bin to PATH
+        uses: myci-actions/export-env-var@main
+        with: {name: PATH, value: "$PATH:$HOME/.local/bin"}
       - name: install conan
-        run: pip3 --quiet install conan
+        run: pipx install conan
       - name: create default conan profile
         run: |
           conan profile detect --name default
@@ -463,7 +464,7 @@ jobs:
       - name: build
         run: |
           conan remote add cppfw $MYCI_CONAN_REMOTE
-          conan create conan --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
+          conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
       - name: deploy conan package
         run: |
           conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER