From 547cbbbd34da7a2707cdfbd6fa0e64ec6a581db4 Mon Sep 17 00:00:00 2001 From: Tom Read Cutting Date: Fri, 19 Aug 2022 09:18:16 +0100 Subject: [PATCH 1/3] Add windows to redis cross-compilation matrix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da9b974..466ed96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, windows-latest] steps: - name: Checkout uses: actions/checkout@v3 From 338f95c2905c5a436301d3470488aa5ecaabbee3 Mon Sep 17 00:00:00 2001 From: Tom Read Cutting Date: Fri, 19 Aug 2022 09:30:27 +0100 Subject: [PATCH 2/3] Use github context to access workspace path This should hopefully work on windows unlike with environment variables. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 466ed96..088f21f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,13 +48,13 @@ jobs: ref: moosichu/test-zar path: redis - name: Build Redis Linux - run: make CC="zig cc -target x86_64-linux-musl" CXX="zig c++ -target x86_64-linux-musl" AR="${GITHUB_WORKSPACE}/zig-out/bin/zar" RANLIB="zig ranlib" uname_S="Linux" uname_M="x86_64" USE_JEMALLOC=no USE_SYSTEMD=no + run: make CC="zig cc -target x86_64-linux-musl" CXX="zig c++ -target x86_64-linux-musl" AR="${{ github.workspace }}/zig-out/bin/zar" RANLIB="zig ranlib" uname_S="Linux" uname_M="x86_64" USE_JEMALLOC=no USE_SYSTEMD=no working-directory: redis - name: Clean run: make clean working-directory: redis - name: Build Redis macOS - run: make CC="zig cc -target x86_64-macos" CXX="zig c++ -target x86_64-macos" AR="${GITHUB_WORKSPACE}/zig-out/bin/zar" RANLIB="zig ranlib" uname_S="Darwin" uname_M="x86_64" USE_JEMALLOC=no USE_SYSTEMD=no + run: make CC="zig cc -target x86_64-macos" CXX="zig c++ -target x86_64-macos" AR="${{ github.workspace }}/zig-out/bin/zar" RANLIB="zig ranlib" uname_S="Darwin" uname_M="x86_64" USE_JEMALLOC=no USE_SYSTEMD=no working-directory: redis test_io_errors_handled: name: Test handled errors are actually handled From 5ee26e11bd05e681b297d793e9d352f89a26ee6f Mon Sep 17 00:00:00 2001 From: Tom Read Cutting Date: Fri, 19 Aug 2022 09:41:06 +0100 Subject: [PATCH 3/3] Prevent backslash escapes for github workspace path on windows --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 088f21f..66c25de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,13 +48,13 @@ jobs: ref: moosichu/test-zar path: redis - name: Build Redis Linux - run: make CC="zig cc -target x86_64-linux-musl" CXX="zig c++ -target x86_64-linux-musl" AR="${{ github.workspace }}/zig-out/bin/zar" RANLIB="zig ranlib" uname_S="Linux" uname_M="x86_64" USE_JEMALLOC=no USE_SYSTEMD=no + run: make CC="zig cc -target x86_64-linux-musl" CXX="zig c++ -target x86_64-linux-musl" AR="'${{ github.workspace }}/zig-out/bin/zar'" RANLIB="zig ranlib" uname_S="Linux" uname_M="x86_64" USE_JEMALLOC=no USE_SYSTEMD=no working-directory: redis - name: Clean run: make clean working-directory: redis - name: Build Redis macOS - run: make CC="zig cc -target x86_64-macos" CXX="zig c++ -target x86_64-macos" AR="${{ github.workspace }}/zig-out/bin/zar" RANLIB="zig ranlib" uname_S="Darwin" uname_M="x86_64" USE_JEMALLOC=no USE_SYSTEMD=no + run: make CC="zig cc -target x86_64-macos" CXX="zig c++ -target x86_64-macos" AR="'${{ github.workspace }}/zig-out/bin/zar'" RANLIB="zig ranlib" uname_S="Darwin" uname_M="x86_64" USE_JEMALLOC=no USE_SYSTEMD=no working-directory: redis test_io_errors_handled: name: Test handled errors are actually handled