From 413e3f1799f3ad91d3da4ba6066bdc58c106d209 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Thu, 14 Nov 2024 14:21:17 +0200 Subject: [PATCH] no old builds --- .github/workflows/ci.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b010d7e..15071e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -125,7 +125,7 @@ jobs: - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]} - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]} # - {os: ubuntu, codename: focal, image_owner: } - - {os: ubuntu, codename: jammy, image_owner: } + # - {os: ubuntu, codename: jammy, image_owner: } - {os: ubuntu, codename: noble, image_owner: } # - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm32,docker]} # - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]} @@ -418,10 +418,12 @@ jobs: 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: ubuntu, codename: jammy, image_owner: } + # - {os: ubuntu, codename: noble, image_owner: } + - {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 }} @@ -439,9 +441,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@master + 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