Skip to content

Commit

Permalink
chore: bump spin version to 1.5.0 (#151)
Browse files Browse the repository at this point in the history
  • Loading branch information
jprendes authored Sep 21, 2023
1 parent ec90462 commit fd40db4
Show file tree
Hide file tree
Showing 17 changed files with 939 additions and 105 deletions.
7 changes: 7 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[profile.release]
strip = "symbols"
panic = "abort"

[target.aarch64-unknown-linux-musl]
# see https://github.com/fermyon/spin/commit/07db218dccf2d02eb6c8c74d0b39dd2eb59cc4b4
rustflags = ["-Ctarget-feature=+fp16"]
3 changes: 0 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ jobs:
with:
workspaces: |
"containerd-shim-*-v1 -> target"
- name: "Install Rust Wasm targets"
run: |
make install-rust-targets
- name: "Install dependencies"
run: |
sudo apt-get update
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ jobs:
with:
workspaces: |
"containerd-shim-*-v1 -> target"
- name: "Install Rust Wasm targets"
run: |
make install-rust-targets
- name: "Install dependencies"
run: |
sudo apt-get update
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,14 @@ build: $(foreach shim,$(SHIMS),build-$(shim)-cross-$(TARGET))
install-cross:
@if [ -z $$(which cross) ]; then cargo install cross --git https://github.com/cross-rs/cross; fi

.PHONY: install-rust-targets
install-rust-targets:
rustup target add wasm32-wasi && rustup target add wasm32-unknown-unknown

# build-cross can be be used to build any cross supported target (make build-cross-x86_64-unknown-linux-musl)
.PHONY: $(BUILD_TARGETS)
$(BUILD_TARGETS): SHIM = $(word 2,$(subst -, ,$@))
$(BUILD_TARGETS): install-cross
cross build --release --target $(TARGET) --manifest-path=containerd-shim-$(SHIM)-v1/Cargo.toml $(VERBOSE_FLAG)

.PHONY: build-%
build-%: install-rust-targets
build-%:
cargo build --release --manifest-path=containerd-shim-$*-v1/Cargo.toml

.PHONY: install
Expand Down
Loading

0 comments on commit fd40db4

Please sign in to comment.