From 88c8c7909a4278ce6354117f603b401823d31a4b Mon Sep 17 00:00:00 2001 From: Sebastian Reimers Date: Sat, 27 Aug 2022 13:10:43 +0200 Subject: [PATCH 1/4] ci/mingw: fix make retest --- .github/workflows/mingw.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 5925e916d..ee1e464aa 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -51,9 +51,7 @@ jobs: - name: "build" run: | - cd baresip-win32/retest && \ - cmake -B build -DCMAKE_TOOLCHAIN_FILE=../re/cmake/mingw.cmake && \ - cmake --build build -j + cd baresip-win32 && make retest - uses: actions/upload-artifact@v2 with: From aee6882e0cc71caa36a710d93a9c0f7fb3637e88 Mon Sep 17 00:00:00 2001 From: Sebastian Reimers Date: Sat, 27 Aug 2022 13:19:15 +0200 Subject: [PATCH 2/4] bump openssl and fix wintest path --- .github/workflows/mingw.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index ee1e464aa..df175cf10 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -39,14 +39,14 @@ jobs: id: openssl with: path: baresip-win32/openssl - key: ${{ runner.os }}-mingw-openssl-3.0.2 + key: ${{ runner.os }}-mingw-openssl-3.0.5 - name: "build openssl" if: steps.openssl.outputs.cache-hit != 'true' run: | - wget https://www.openssl.org/source/openssl-3.0.2.tar.gz - tar -xzf openssl-3.0.2.tar.gz - mv openssl-3.0.2 baresip-win32/openssl + wget https://www.openssl.org/source/openssl-3.0.5.tar.gz + tar -xzf openssl-3.0.5.tar.gz + mv openssl-3.0.5 baresip-win32/openssl make -j$(nproc) -C baresip-win32 openssl - name: "build" @@ -66,9 +66,6 @@ jobs: steps: - uses: actions/download-artifact@v2 - uses: actions/checkout@v2 - with: - path: baresip - - uses: sreimers/pr-dependency-action@v0.5 with: name: retest From 12ed48b93800e26d3467261dd84a6bf34bc83992 Mon Sep 17 00:00:00 2001 From: Sebastian Reimers Date: Sat, 27 Aug 2022 13:33:36 +0200 Subject: [PATCH 3/4] reorder download artifact --- .github/workflows/mingw.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index df175cf10..d09415cda 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -64,8 +64,8 @@ jobs: needs: MinGW-w64-build steps: - - uses: actions/download-artifact@v2 - uses: actions/checkout@v2 + - uses: actions/download-artifact@v2 - uses: sreimers/pr-dependency-action@v0.5 with: name: retest @@ -73,5 +73,5 @@ jobs: secret: ${{ secrets.GITHUB_TOKEN }} - name: "run retest.exe" - run: mv retest-exe/retest.exe retest/ && cd retest && ./retest.exe + run: ls -lha && mv retest-exe/retest.exe retest/ && cd retest && ./retest.exe shell: bash From 9905a17e5c6d2366bf2040fd88f9e768f5f138a0 Mon Sep 17 00:00:00 2001 From: Sebastian Reimers Date: Sat, 27 Aug 2022 13:40:59 +0200 Subject: [PATCH 4/4] remove debug ls --- .github/workflows/mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index d09415cda..72c4eb9ee 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -73,5 +73,5 @@ jobs: secret: ${{ secrets.GITHUB_TOKEN }} - name: "run retest.exe" - run: ls -lha && mv retest-exe/retest.exe retest/ && cd retest && ./retest.exe + run: mv retest-exe/retest.exe retest/ && cd retest && ./retest.exe shell: bash