From 1626c6572e490be38d403bdd79978f3bbcf43b30 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 18 Sep 2024 17:41:48 +0200 Subject: [PATCH] ci: target gnu on windows Signed-off-by: Roman Volosatovs --- .github/workflows/west.yml | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/west.yml b/.github/workflows/west.yml index 2f99a34..c5ec88f 100644 --- a/.github/workflows/west.yml +++ b/.github/workflows/west.yml @@ -49,7 +49,7 @@ jobs: matrix: config: - os: windows-latest - target: x86_64-pc-windows-msvc + target: x86_64-pc-windows-gnu - os: macos-13 target: x86_64-apple-darwin @@ -65,10 +65,7 @@ jobs: - uses: Swatinem/rust-cache@v2.7.3 - run: cargo build -p west-sys --release --target ${{ matrix.config.target }} - run: mkdir -p artifact/lib - - run: mv target/release/${{ matrix.config.target }}/libwest_sys.a artifact/lib/libwest_sys.a - if: matrix.config.os != 'windows-latest' - - run: mv target/release/${{ matrix.config.target }}/west_sys.lib artifact/lib/west_sys.lib - if: matrix.config.os == 'windows-latest' + - run: mv target/${{ matrix.config.target }}/release/libwest_sys.a artifact/lib/libwest_sys.a - uses: actions/upload-artifact@v4 with: name: west-${{ matrix.config.target }} @@ -100,7 +97,7 @@ jobs: - os: windows-latest lib: x86_64-windows - target: x86_64-pc-windows-msvc + target: x86_64-pc-windows-gnu - os: macos-13 lib: x86_64-darwin @@ -126,12 +123,9 @@ jobs: with: name: west-${{ matrix.config.target }} - run: mv lib/libwest_sys.a "lib/${{ matrix.config.lib }}/libwest.a" - if: matrix.config.os != 'windows-latest' - - run: mv lib/west_sys.lib "lib/${{ matrix.config.lib }}/west.lib" - if: matrix.config.os == 'windows-latest' - uses: actions/setup-go@v5 with: - go-version-file: 'go.mod' + go-version-file: go.mod - run: rustup show - uses: Swatinem/rust-cache@v2.7.3 - uses: cargo-bins/cargo-binstall@v1.10.5 @@ -158,21 +152,18 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@v5 with: - go-version-file: 'go.mod' + go-version-file: go.mod - run: rustup show - uses: Swatinem/rust-cache@v2.7.3 - uses: cargo-bins/cargo-binstall@v1.10.5 - run: cargo binstall -y wasm-tools@1.217 - run: cargo test --workspace --all-targets - run: go generate -tags=dev ./... - if: matrix.os != 'windows-latest' - - run: | - cargo build -p west-sys --target x86_64-pc-windows-msvc - cargo build -p west-passthrough --target wasm32-unknown-unknown - go generate -tags=dev ./examples/go/... - go generate -tags=dev ./tests/go/... - wasm-tools component new target/wasm32-unknown-unknown/debug/west_passthrough.wasm -o lib/passthrough.wasm if: matrix.os == 'windows-latest' + env: + CARGO_BUILD_TARGET: x86_64-pc-windows-gnu + - run: go generate -tags=dev ./... + if: matrix.config.os != 'windows-latest' - run: go test -tags=dev ./... env: GOGC: 1 @@ -186,7 +177,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@v5 with: - go-version-file: 'go.mod' + go-version-file: go.mod - run: gofmt -w -s **/*.go - run: git diff --exit-code