From 5042c92fd8fc1b5d4410d05f865a4803bd793103 Mon Sep 17 00:00:00 2001 From: Sebastian Reimers Date: Fri, 3 Feb 2023 11:02:59 +0100 Subject: [PATCH 1/2] ci/ssl: try to fix openssl root dir --- .github/workflows/ssl.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ssl.yml b/.github/workflows/ssl.yml index f9a78d9b0..f87f27d08 100644 --- a/.github/workflows/ssl.yml +++ b/.github/workflows/ssl.yml @@ -12,6 +12,7 @@ jobs: env: CMAKE_GENERATOR: Ninja + OPENSSL_ROOT_DIR: "assets/${{ matrix.ssl }}" steps: - uses: actions/checkout@v3 @@ -30,4 +31,4 @@ jobs: wget "https://github.com/baresip/ci/releases/download/v0.1/assets.tar.gz" tar -xf assets.tar.gz - name: make - run: cmake -B build -DCMAKE_C_FLAGS="-Iassets/${{ matrix.ssl }}/include -Werror" -DCMAKE_EXE_LINKER_FLAGS="-Lassets/${{ matrix.ssl }}" && cmake --build build -j + run: cmake -B build && cmake --build build -j From 6fc731d1454d3128f975476f32e8d15bd22cc435 Mon Sep 17 00:00:00 2001 From: Sebastian Reimers Date: Fri, 3 Feb 2023 11:10:30 +0100 Subject: [PATCH 2/2] re-add -Werror --- .github/workflows/ssl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ssl.yml b/.github/workflows/ssl.yml index f87f27d08..1e667bb0a 100644 --- a/.github/workflows/ssl.yml +++ b/.github/workflows/ssl.yml @@ -31,4 +31,4 @@ jobs: wget "https://github.com/baresip/ci/releases/download/v0.1/assets.tar.gz" tar -xf assets.tar.gz - name: make - run: cmake -B build && cmake --build build -j + run: cmake -B build -DCMAKE_C_FLAGS="-Werror" && cmake --build build -j