From 3a794bdd5a198ae81477df0b735492412ff0b76d Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 30 Jan 2024 15:04:31 +0100
Subject: [PATCH 1/2] Bump Tooling Rust compiler to 1.75.0

---
 .circleci/config.yml      | 8 ++++----
 docs/COMPILER_VERSIONS.md | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d5fdcf28b..ce373d474 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -139,7 +139,7 @@ jobs:
     docker:
       # The audit tool might use a more modern Rust version than the build jobs. See
       # "Tooling Rust compiler" in docs/COMPILER_VERSIONS.md
-      - image: cimg/rust:1.70.0
+      - image: cimg/rust:1.75.0
     steps:
       - checkout
       - run:
@@ -152,8 +152,8 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v3-libwasmvm_audit-rust:1.70.0-{{ checksum "libwasmvm/Cargo.lock" }}
-            - cargocache-v3-libwasmvm_audit-rust:1.70.0-
+            - v3-libwasmvm_audit-rust:1.75.0-{{ checksum "libwasmvm/Cargo.lock" }}
+            - v3-libwasmvm_audit-rust:1.75.0-
       - run:
           name: Install cargo-audit
           command: cargo install --debug cargo-audit --version 0.17.6
@@ -164,7 +164,7 @@ jobs:
       - save_cache:
           paths:
             - ~/.cargo/registry
-          key: cargocache-v3-libwasmvm_audit-rust:1.70.0-{{ checksum "libwasmvm/Cargo.lock" }}
+          key: v3-libwasmvm_audit-rust:1.75.0-{{ checksum "libwasmvm/Cargo.lock" }}
 
   format-go:
     docker:
diff --git a/docs/COMPILER_VERSIONS.md b/docs/COMPILER_VERSIONS.md
index d20d6b196..380906ead 100644
--- a/docs/COMPILER_VERSIONS.md
+++ b/docs/COMPILER_VERSIONS.md
@@ -65,4 +65,4 @@ We currently use the following version:
 | ------------------------ | ------------ | --------------------------------- |
 | Production Rust compiler | 1.73.0       | Builders version 0017             |
 | Min Rust compiler        | 1.70.0       | Supports builder versions >= 0017 |
-| Tooling Rust compiler    | 1.70.0       |                                   |
+| Tooling Rust compiler    | 1.75.0       |                                   |

From 6dd292e9e9a2d75d8d1783303cb43b2efd3c6ba9 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 30 Jan 2024 16:08:27 +0100
Subject: [PATCH 2/2] Set version cosmwasm/go-ext-builder:0018

---
 .circleci/config.yml | 5 ++---
 Makefile             | 5 ++---
 builders/Makefile    | 2 +-
 builders/README.md   | 2 ++
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ce373d474..0d19c000d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -389,9 +389,8 @@ jobs:
                   mkdir artifacts
 
                   # Static (from build)
-                  # TODO: Change this line to libwasmvm_muslc.x86_64.a when upgrading to builders 0018+
-                  cp ./internal/api/libwasmvm_muslc.a artifacts/libwasmvm_muslc.x86_64.a
-                  cp ./internal/api/libwasmvm_muslc.aarch64.a artifacts/libwasmvm_muslc.aarch64.a
+                  cp ./internal/api/libwasmvm_muslc.x86_64.a artifacts/
+                  cp ./internal/api/libwasmvm_muslc.aarch64.a artifacts/
                   cp ./internal/api/libwasmvmstatic_darwin.a artifacts/
 
                   # Shared (from git)
diff --git a/Makefile b/Makefile
index 302ae9247..0f84c83aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: all build build-rust build-go test
 
 # Builds the Rust library libwasmvm
-BUILDERS_PREFIX := cosmwasm/go-ext-builder:0017
+BUILDERS_PREFIX := cosmwasm/go-ext-builder:0018
 # Contains a full Go dev environment including CGO support in order to run Go tests on the built shared library
 # This image is currently not published.
 ALPINE_TESTER := cosmwasm/alpine-tester:local
@@ -77,8 +77,7 @@ release-build-alpine:
 	rm -rf libwasmvm/target/x86_64-unknown-linux-musl/release
 	# build the muslc *.a file
 	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-alpine
-# TODO: Change this line to libwasmvm_muslc.x86_64.a when upgrading to builders 0018+
-	cp libwasmvm/artifacts/libwasmvm_muslc.a internal/api
+	cp libwasmvm/artifacts/libwasmvm_muslc.x86_64.a internal/api
 	cp libwasmvm/artifacts/libwasmvm_muslc.aarch64.a internal/api
 	make update-bindings
 
diff --git a/builders/Makefile b/builders/Makefile
index 6e6e25ef1..fcff04c80 100644
--- a/builders/Makefile
+++ b/builders/Makefile
@@ -1,6 +1,6 @@
 # Versioned by a simple counter that is not bound to a specific CosmWasm version
 # See builders/README.md
-BUILDERS_PREFIX := cosmwasm/go-ext-builder:0017
+BUILDERS_PREFIX := cosmwasm/go-ext-builder:0018
 
 .PHONY: docker-image-centos7
 docker-image-centos7:
diff --git a/builders/README.md b/builders/README.md
index 5483a2bca..651b576f1 100644
--- a/builders/README.md
+++ b/builders/README.md
@@ -21,6 +21,8 @@ versions of the builder images.
 
 **Unreleased**
 
+**Version 0018:**
+
 - Remove Go dev environment from `cosmwasm/go-ext-builder:XXXX-alpine`
 - Write x86_64 muslc output in `libwasmvm_muslc.x86_64.a` instead of
   `libwasmvm_muslc.a`