From 51479219b7f20b1c1b8765793e6d892d9f691717 Mon Sep 17 00:00:00 2001 From: Antoine Gouby Date: Sun, 10 Dec 2023 02:12:59 +0100 Subject: [PATCH] efe --- .github/workflows/build.yml | 28 ++++++++++++++++------------ docker/Dockerfile | 2 +- toto | 0 3 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 toto diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fad3aaf..d3a9706 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,13 +7,12 @@ jobs: runs-on: ubuntu-latest container: image: ghcr.io/panduza/pzacxx-build-img:latest - options: --user 1001 strategy: matrix: os: [linux] compiler: [gcc] - build_type: [Debug] - shared: ["True", "False"] + build_type: [debug, release] + lib_type: [shared, static] exclude: - os: linux compiler: mingw @@ -33,20 +32,25 @@ jobs: uses: actions/cache@v2 with: path: ~/.conan2/p - key: conan-cache-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.build_type }}-${{ matrix.shared }} + key: conan-cache-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.build_type }}-${{ matrix.lib_type }} - - name: "Install" - run: - conan install -pr:b ./conan_profiles/linux_gcc -pr:h ./conan_profiles/${{ matrix.os }}_${{ matrix.compiler }} --build=missing -s build_type=${{ matrix.build_type }} -o shared=${{ matrix.shared }} . + - id: build_type + uses: ASzc/change-string-case-action@v6 + with: + string: ${{ matrix.build_type }} - - name: "Build" + - name: "Install" run: | - if [ "${{ matrix.shared }}" = "True" ]; then - lib_type="shared" + if [ "${{ matrix.lib_type }}" = "static" ]; then + shared="False" else - lib_type="static" + shared="True" fi + conan install -pr:b ./conan_profiles/linux_gcc -pr:h ./conan_profiles/${{ matrix.os }}_${{ matrix.compiler }} --build=missing -s build_type=${{ steps.build_type.outputs.capitalized }} -o shared=$shared . + + - name: "Build" + run: | ls -l build echo "build folder: ./build/${{ matrix.os }}-${{ matrix.compiler }}-$lib_type" cmake --preset ${{ matrix.os }}-${{ matrix.compiler }}-$lib_type - cmake --build ./build/${{ matrix.os }}-${{ matrix.compiler }}-$lib_type --config ${{ matrix.build_type }} + cmake --build --preset ${{ matrix.os }}-${{ matrix.compiler }}-$lib_type-${{ matrix.build_type }} diff --git a/docker/Dockerfile b/docker/Dockerfile index e9f8c54..cd87857 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,4 +31,4 @@ USER root RUN ln -s /usr/x86_64-w64-mingw32/lib/librpcrt4.a /usr/x86_64-w64-mingw32/lib/libRpcRT4.a RUN userdel -r mingw -RUN git config --global --add safe.directory '*' +RUN git config --system --add safe.directory '*' diff --git a/toto b/toto new file mode 100644 index 0000000..e69de29