Skip to content

Commit

Permalink
this is never going to end
Browse files Browse the repository at this point in the history
Signed-off-by: Roman Volosatovs <[email protected]>
  • Loading branch information
rvolosatovs committed Sep 19, 2024
1 parent 6fc6a04 commit 8df2f4a
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
22 changes: 17 additions & 5 deletions .github/workflows/west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,13 @@ jobs:
- uses: msys2/setup-msys2@v2
if: matrix.config.os == 'windows-latest'
with:
path-type: inherit
update: true
install: mingw-w64-x86_64-toolchain

msystem: MINGW64
path-type: inherit
- run: git config --global core.autocrlf input
if: matrix.config.os == 'windows-latest'

- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
Expand All @@ -142,12 +144,15 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
if: matrix.config.os != 'windows-latest'
- run: rustup show
if: matrix.config.os != 'windows-latest'
- uses: Swatinem/[email protected]
if: matrix.config.os != 'windows-latest'
- uses: cargo-bins/[email protected]
- run: cargo binstall -y [email protected]
- run: go generate ./tests/go/...
- run: go test ./...
- run: go test -failfast ./...
env:
GOGC: 1
WEST_LOG: trace
Expand Down Expand Up @@ -178,22 +183,29 @@ jobs:
- uses: msys2/setup-msys2@v2
if: matrix.config.os == 'windows-latest'
with:
path-type: inherit
update: true
install: mingw-w64-x86_64-toolchain
msystem: MINGW64
path-type: inherit
- run: git config --global core.autocrlf input
if: matrix.config.os == 'windows-latest'

- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/setup-go@v5
with:
go-version-file: go.mod

- run: rustup set default-host x86_64-pc-windows-gnu
if: matrix.config.os == 'windows-latest'
- run: rustup show

- uses: Swatinem/[email protected]
- uses: cargo-bins/[email protected]
- run: cargo binstall -y [email protected]
- run: cargo test --workspace --all-targets
if: matrix.config.os != 'windows-latest'
- run: go generate -tags=dev ./...
- run: go test -tags=dev ./...
- run: go test -failfast -tags=dev ./...
env:
GOGC: 1
WEST_LOG: trace
Expand Down
3 changes: 1 addition & 2 deletions west.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

package west

// #cgo windows CFLAGS: -DWASM_API_EXTERN= -DWASI_API_EXTERN=
// #cgo !windows LDFLAGS: -lm -ldl -pthread
// #cgo windows LDFLAGS: -luserenv -lole32 -lntdll -lws2_32 -lkernel32 -lbcrypt
// #cgo windows LDFLAGS: -lws2_32 -lole32 -lntdll
// #include "./include/west.h"
// #include <stdlib.h>
import "C"
Expand Down

0 comments on commit 8df2f4a

Please sign in to comment.