From 1c676cbcfb418e80439e6350947132ac5e35d81a Mon Sep 17 00:00:00 2001 From: Matt Knight Date: Wed, 13 Apr 2022 07:13:05 -0700 Subject: [PATCH] support windows builds (#14) * support windows builds * add gitattributes for line ending --- tools/regz/.gitattributes | 1 + tools/regz/.github/workflows/ci.yml | 66 ++++++++++++++--------------- tools/regz/libs/zig-libxml2 | 2 +- 3 files changed, 35 insertions(+), 34 deletions(-) create mode 100644 tools/regz/.gitattributes diff --git a/tools/regz/.gitattributes b/tools/regz/.gitattributes new file mode 100644 index 0000000..ef01f61 --- /dev/null +++ b/tools/regz/.gitattributes @@ -0,0 +1 @@ +*.zig text eol=lf diff --git a/tools/regz/.github/workflows/ci.yml b/tools/regz/.github/workflows/ci.yml index f2bcb9c..9049f7f 100644 --- a/tools/regz/.github/workflows/ci.yml +++ b/tools/regz/.github/workflows/ci.yml @@ -20,11 +20,11 @@ jobs: aarch64-macos, i386-linux-gnu, i386-linux-musl, - #i386-windows, + i386-windows, x86_64-linux-gnu, x86_64-linux-musl, x86_64-macos, - #x86_64-windows-gnu, + x86_64-windows-gnu, ] mode: [ debug, @@ -58,7 +58,7 @@ jobs: matrix: os: [ ubuntu-latest, - #windows-latest, + windows-latest, macos-latest, ] mode: [ @@ -87,36 +87,36 @@ jobs: if: ${{ matrix.mode != 'debug' }} run: zig build test -D${{ matrix.mode }} - #crosscompile-from-windows: - # runs-on: windows-latest - # strategy: - # matrix: - # target: [ - # #riscv64-linux-gnu, - # #riscv64-linux-musl, - # aarch64-linux-gnu, - # aarch64-linux-musl, - # aarch64-macos, - # i386-linux-gnu, - # i386-linux-musl, - # x86_64-linux-gnu, - # x86_64-linux-musl, - # x86_64-macos, - # ] - # steps: - # - name: Checkout - # uses: actions/checkout@v2 - # with: - # submodules: recursive - # fetch-depth: 0 + crosscompile-from-windows: + runs-on: windows-latest + strategy: + matrix: + target: [ + #riscv64-linux-gnu, + #riscv64-linux-musl, + aarch64-linux-gnu, + aarch64-linux-musl, + aarch64-macos, + i386-linux-gnu, + i386-linux-musl, + x86_64-linux-gnu, + x86_64-linux-musl, + x86_64-macos, + ] + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: recursive + fetch-depth: 0 - # - name: Setup Zig - # uses: goto-bus-stop/setup-zig@v1.3.0 - # with: - # version: master + - name: Setup Zig + uses: goto-bus-stop/setup-zig@v1.3.0 + with: + version: master - # - name: Build - # run: zig build + - name: Build + run: zig build crosscompile-from-macos: runs-on: macos-latest @@ -129,10 +129,10 @@ jobs: aarch64-linux-musl, i386-linux-gnu, i386-linux-musl, - #i386-windows, + i386-windows, x86_64-linux-gnu, x86_64-linux-musl, - #x86_64-windows-gnu, + x86_64-windows-gnu, ] steps: - name: Checkout diff --git a/tools/regz/libs/zig-libxml2 b/tools/regz/libs/zig-libxml2 index c2cf5ec..db78050 160000 --- a/tools/regz/libs/zig-libxml2 +++ b/tools/regz/libs/zig-libxml2 @@ -1 +1 @@ -Subproject commit c2cf5ec294d08adfa0fc7aea7245a83871ed19f2 +Subproject commit db7805026143d753a1deb84c23580d8050471223