Skip to content

Commit a126388

Browse files
committed
conan: fix build
1 parent 37f3bd3 commit a126388

File tree

1 file changed

+49
-49
lines changed

1 file changed

+49
-49
lines changed

.github/workflows/ci.yml

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ jobs:
249249
- name: build
250250
run: |
251251
conan remote add cppfw $MYCI_CONAN_REMOTE
252-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
252+
conan create conan --build=missing --conf tools.system.package_manager:mode=install --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
253253
- name: deploy conan package
254254
run: |
255255
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -310,51 +310,51 @@ jobs:
310310
if: startsWith(github.ref, 'refs/tags/')
311311

312312
##### conan - emscripten #####
313-
conan-emscripten:
314-
strategy:
315-
fail-fast: false
316-
matrix:
317-
include:
318-
# - {os: ubuntu, codename: noble, image_owner: }
319-
- {os: debian, codename: bookworm, image_owner: }
320-
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
321-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
322-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
323-
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
324-
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
325-
name: conan - emscripten | ${{ matrix.labels[0] }}
326-
steps:
327-
- name: add cppfw deb repo
328-
uses: myci-actions/add-deb-repo@main
329-
with:
330-
repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
331-
repo-name: cppfw
332-
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
333-
install: devscripts equivs myci pipx cmake git nodejs
334-
- name: add ~/.local/bin to PATH
335-
uses: myci-actions/export-env-var@main
336-
with: {name: PATH, value: "$PATH:$HOME/.local/bin"}
337-
- name: install conan
338-
run: pipx install conan
339-
- name: create default conan profile
340-
run: |
341-
conan profile detect --name default
342-
sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
343-
- name: git clone
344-
uses: myci-actions/checkout@main
345-
with:
346-
submodules: false
347-
- name: set PACKAGE_VERSION
348-
uses: myci-actions/export-env-var@main
349-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
350-
if: startsWith(github.ref, 'refs/tags/')
351-
- name: build
352-
run: |
353-
conan remote add cppfw $MYCI_CONAN_REMOTE
354-
# NOTE: specifying empty test folder to skip the test stage
355-
conan create conan --profile:build default --profile:host emscripten/conan.profile --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --test-folder ""
356-
- name: deploy conan package
357-
run: |
358-
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
359-
conan upload --check --remote cppfw $PACKAGE_NAME/$PACKAGE_VERSION@$MYCI_CONAN_USER/main
360-
if: startsWith(github.ref, 'refs/tags/')
313+
# conan-emscripten:
314+
# strategy:
315+
# fail-fast: false
316+
# matrix:
317+
# include:
318+
# # - {os: ubuntu, codename: noble, image_owner: }
319+
# - {os: debian, codename: bookworm, image_owner: }
320+
# # - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
321+
# # - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
322+
# # - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
323+
# runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
324+
# container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
325+
# name: conan - emscripten | ${{ matrix.labels[0] }}
326+
# steps:
327+
# - name: add cppfw deb repo
328+
# uses: myci-actions/add-deb-repo@main
329+
# with:
330+
# repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
331+
# repo-name: cppfw
332+
# keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
333+
# install: devscripts equivs myci pipx cmake git nodejs
334+
# - name: add ~/.local/bin to PATH
335+
# uses: myci-actions/export-env-var@main
336+
# with: {name: PATH, value: "$PATH:$HOME/.local/bin"}
337+
# - name: install conan
338+
# run: pipx install conan
339+
# - name: create default conan profile
340+
# run: |
341+
# conan profile detect --name default
342+
# sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
343+
# - name: git clone
344+
# uses: myci-actions/checkout@main
345+
# with:
346+
# submodules: false
347+
# - name: set PACKAGE_VERSION
348+
# uses: myci-actions/export-env-var@main
349+
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
350+
# if: startsWith(github.ref, 'refs/tags/')
351+
# - name: build
352+
# run: |
353+
# conan remote add cppfw $MYCI_CONAN_REMOTE
354+
# # NOTE: specifying empty test folder to skip the test stage
355+
# conan create conan --profile:build default --profile:host emscripten/conan.profile --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --test-folder ""
356+
# - name: deploy conan package
357+
# run: |
358+
# conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
359+
# conan upload --check --remote cppfw $PACKAGE_NAME/$PACKAGE_VERSION@$MYCI_CONAN_USER/main
360+
# if: startsWith(github.ref, 'refs/tags/')

0 commit comments

Comments
 (0)