From 4a6b84d56c18ae9af43c941124b2941cffdaae4b Mon Sep 17 00:00:00 2001 From: jhernandezb Date: Tue, 4 Feb 2025 10:57:54 -0600 Subject: [PATCH] bump wasmvm version --- .drone.star.yml | 96 ++++++++++----------- .drone.yml | 6 +- Dockerfile | 8 +- cmd/starsd/cmd/start.go | 2 +- scripts/drone/pipelines/test_and_build.star | 4 +- 5 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.drone.star.yml b/.drone.star.yml index 5bed2d261..61ae6d1c3 100644 --- a/.drone.star.yml +++ b/.drone.star.yml @@ -2,54 +2,54 @@ kind: pipeline name: test_and_build services: -- image: docker:dind - name: dind - privileged: true - volumes: - - name: dockersock - path: /var/run + - image: docker:dind + name: dind + privileged: true + volumes: + - name: dockersock + path: /var/run steps: -- commands: - - git fetch --tags - image: alpine/git - name: fetch -- commands: - - sleep 10 - - ls -l /var/run/docker.sock - - test -S /var/run/docker.sock && echo 'Docker socket found' || echo 'Docker socket - missing' - image: alpine - name: debug_dind - volumes: - - name: dockersock - path: /var/run -- commands: - - ./scripts/go-test.sh - environment: - GOPROXY: http://goproxy - image: publicawesome/golang:1.23.5-devtooling - name: test -- commands: - - apk add --no-cache ca-certificates build-base git - - wget https://github.com/CosmWasm/wasmvm/releases/download/v2.1.4/libwasmvm_muslc.x86_64.a - -O /lib/libwasmvm_muslc.x86_64.a - - echo 'a4a3d09b36fabb65b119d5ba23442c23694401fcbee4451fe6b7e22e325a4bac /lib/libwasmvm_muslc.x86_64.a' - | sha256sum -c - - LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build - - echo 'Ensuring binary is statically linked ...' && (file $PWD/bin/starsd | grep - 'statically linked') - environment: - GOPROXY: http://goproxy - image: golang:1.23.5-alpine3.20 - name: build -- commands: - - docker build -t publicawesome/stargaze:latest . - image: docker:24 - name: build_docker - volumes: - - name: dockersock - path: /var/run + - commands: + - git fetch --tags + image: alpine/git + name: fetch + - commands: + - sleep 10 + - ls -l /var/run/docker.sock + - test -S /var/run/docker.sock && echo 'Docker socket found' || echo 'Docker socket + missing' + image: alpine + name: debug_dind + volumes: + - name: dockersock + path: /var/run + - commands: + - ./scripts/go-test.sh + environment: + GOPROXY: http://goproxy + image: publicawesome/golang:1.23.5-devtooling + name: test + - commands: + - apk add --no-cache ca-certificates build-base git + - wget https://github.com/CosmWasm/wasmvm/releases/download/v2.1.5/libwasmvm_muslc.x86_64.a + -O /lib/libwasmvm_muslc.x86_64.a + - echo 'c6612d17d82b0997696f1076f6d894e339241482570b9142f29b0d8f21b280bf /lib/libwasmvm_muslc.x86_64.a' + | sha256sum -c + - LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build + - echo 'Ensuring binary is statically linked ...' && (file $PWD/bin/starsd | grep + 'statically linked') + environment: + GOPROXY: http://goproxy + image: golang:1.23.5-alpine3.20 + name: build + - commands: + - docker build -t publicawesome/stargaze:latest . + image: docker:24 + name: build_docker + volumes: + - name: dockersock + path: /var/run type: docker volumes: -- name: dockersock - temp: {} + - name: dockersock + temp: {} diff --git a/.drone.yml b/.drone.yml index c61dbe9a1..52e77a0af 100644 --- a/.drone.yml +++ b/.drone.yml @@ -48,8 +48,8 @@ steps: path: /go commands: - apk add --no-cache ca-certificates build-base git - - wget https://github.com/CosmWasm/wasmvm/releases/download/v2.1.4/libwasmvm_muslc.x86_64.a -O /lib/libwasmvm_muslc.x86_64.a - - echo "a4a3d09b36fabb65b119d5ba23442c23694401fcbee4451fe6b7e22e325a4bac /lib/libwasmvm_muslc.x86_64.a" | sha256sum -c + - wget https://github.com/CosmWasm/wasmvm/releases/download/v2.1.5/libwasmvm_muslc.x86_64.a -O /lib/libwasmvm_muslc.x86_64.a + - echo "c6612d17d82b0997696f1076f6d894e339241482570b9142f29b0d8f21b280bf /lib/libwasmvm_muslc.x86_64.a" | sha256sum -c - LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build - echo "Ensuring binary is statically linked ..." && (file $PWD/bin/starsd | grep "statically linked") environment: @@ -424,6 +424,6 @@ volumes: --- kind: signature -hmac: 1fa82bda77a029c13e98d30cc649d792cca23ee1eeb77f7297722b087330db85 +hmac: 0d62297be8c112a53642d8e44492059dade4ba753a6e9391494a6ce4f8697740 ... diff --git a/Dockerfile b/Dockerfile index d053d9018..e7dff765c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,10 +16,10 @@ COPY . /code/ # See https://github.com/CosmWasm/wasmvm/releases # Download the correct version of libwasmvm for the given platform and verify checksum -ADD https://github.com/CosmWasm/wasmvm/releases/download/v2.1.4/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a -ADD https://github.com/CosmWasm/wasmvm/releases/download/v2.1.4/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a -RUN echo "a4a3d09b36fabb65b119d5ba23442c23694401fcbee4451fe6b7e22e325a4bac /lib/libwasmvm_muslc.x86_64.a" | sha256sum -c -RUN echo "090b97641157fae1ae45e7ed368a1a8c091f3fef67958d3bc7c2fa7e7c54b6b4 /lib/libwasmvm_muslc.aarch64.a" | sha256sum -c +ADD https://github.com/CosmWasm/wasmvm/releases/download/v2.1.5/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a +ADD https://github.com/CosmWasm/wasmvm/releases/download/v2.1.5/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a +RUN echo "c6612d17d82b0997696f1076f6d894e339241482570b9142f29b0d8f21b280bf /lib/libwasmvm_muslc.x86_64.a" | sha256sum -c +RUN echo "1bad0e3f9b72603082b8e48307c7a319df64ca9e26976ffc7a3c317a08fe4b1a /lib/libwasmvm_muslc.aarch64.a" | sha256sum -c # force it to use static lib (from above) not standard libgo_cosmwasm.so file RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build diff --git a/cmd/starsd/cmd/start.go b/cmd/starsd/cmd/start.go index b8ac4051c..ad6e3ec02 100644 --- a/cmd/starsd/cmd/start.go +++ b/cmd/starsd/cmd/start.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" ) -var LibwasmVersion = "2.1.4" +var LibwasmVersion = "2.1.5" func CheckLibwasmVersion(_ *cobra.Command, _ []string) error { version, err := wasmvmapi.LibwasmvmVersion() diff --git a/scripts/drone/pipelines/test_and_build.star b/scripts/drone/pipelines/test_and_build.star index 53ac68d6b..7aa414b8b 100644 --- a/scripts/drone/pipelines/test_and_build.star +++ b/scripts/drone/pipelines/test_and_build.star @@ -1,8 +1,8 @@ go_dev_image = "publicawesome/golang:1.23.5-devtooling" go_image = "golang:1.23.5-alpine3.20" -wasmvm_version = "v2.1.4" -wasmvm_x86_84_hash = "a4a3d09b36fabb65b119d5ba23442c23694401fcbee4451fe6b7e22e325a4bac" +wasmvm_version = "v2.1.5" +wasmvm_x86_84_hash = "c6612d17d82b0997696f1076f6d894e339241482570b9142f29b0d8f21b280bf" docker_image = "docker:24" docker_dind_image = "docker:dind"