Skip to content

Commit

Permalink
ci: use rustup on Windows
Browse files Browse the repository at this point in the history
Signed-off-by: Roman Volosatovs <[email protected]>
  • Loading branch information
rvolosatovs committed Sep 18, 2024
1 parent 609ddb9 commit 2501485
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
16 changes: 11 additions & 5 deletions .github/workflows/west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
- aarch64-unknown-linux-musl
- aarch64-linux-android
- riscv64gc-unknown-linux-gnu
- x86_64-pc-windows-gnu
- x86_64-unknown-linux-musl
# TODO: figure out what's different in Mac libraries built this way
# TODO: figure out what's different in Mac/Windows libraries built this way
#- aarch64-apple-darwin
#- x86_64-apple-darwin
#- x86_64-pc-windows-gnu

name: west-${{ matrix.target }}
runs-on: ubuntu-latest
Expand All @@ -44,10 +44,14 @@ jobs:
with:
package: west-${{ matrix.target }}

build-ffi-darwin:
build-ffi-rustup:
strategy:
matrix:
config:
- os: windows-latest
lib: x86_64-windows
target: x86_64-pc-windows-gnu

- os: macos-13
lib: x86_64-darwin
target: x86_64-apple-darwin
Expand All @@ -64,6 +68,7 @@ jobs:
- uses: Swatinem/[email protected]
- run: cargo build -p west-sys --release
- run: mkdir -p artifact/lib
- run: ls -R target/release
- run: mv target/release/libwest_sys.a artifact/lib/libwest_sys.a
- uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -96,7 +101,7 @@ jobs:

- os: windows-latest
lib: x86_64-windows
target: x86_64-pc-windows-gnu
target: x86_64-pc-windows-msvc

- os: macos-13
lib: x86_64-darwin
Expand All @@ -109,7 +114,7 @@ jobs:
name: test-release (${{ matrix.config.os }})
needs:
- build-ffi
- build-ffi-darwin
- build-ffi-rustup
- build-wasm
runs-on: ${{ matrix.config.os }}
steps:
Expand Down Expand Up @@ -154,6 +159,7 @@ jobs:
go-version-file: 'go.mod'
- run: rustup show
- uses: Swatinem/[email protected]
- run: cargo build -p west-sys
- uses: cargo-bins/[email protected]
- run: cargo binstall -y [email protected]
- run: cargo test --workspace --all-targets
Expand Down
3 changes: 1 addition & 2 deletions build_dev.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@

package west

// #cgo LDFLAGS: -L${SRCDIR}/target/debug -lwest_sys
// #cgo linux LDFLAGS: -lm
// #cgo LDFLAGS: -L${SRCDIR}/target/debug -lwest_sys
import "C"

0 comments on commit 2501485

Please sign in to comment.