From 7e4de3d1b9d5cc90169acf5bdbf508c6bc54cbaf Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Thu, 4 May 2023 11:40:13 -0600 Subject: [PATCH] github-ci: do one Windows build from dist archive As we have 2 Windows builds, do one using the release-style distribution file. --- .github/workflows/builds.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 5a4f27b2c8..a3fe9dbc95 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -3169,7 +3169,7 @@ jobs: windows-msys2-mingw64-libpcap: name: Windows MSYS2 MINGW64 (libpcap) runs-on: windows-latest - needs: [prepare-deps] + needs: [prepare-deps, ubuntu-22-04-dist] defaults: run: shell: msys2 {0} @@ -3194,8 +3194,11 @@ jobs: with: name: prep path: prep - - run: tar xf prep/libhtp.tar.gz - - run: tar xf prep/suricata-update.tar.gz + - name: Download suricata.tar.gz + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 + with: + name: dist + - run: tar xvf suricata-*.tar.gz --strip-components=1 - run: tar xf prep/suricata-verify.tar.gz - name: Build run: |