From 484c9d3ff0bfd2d5c76b5eff4b1dab13ee30572d Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 25 Aug 2022 16:33:56 +0200
Subject: [PATCH] Update docker images for emscripten.

---
 .circleci/config.yml                    | 4 ++--
 scripts/build_emscripten.sh             | 4 ++--
 scripts/ci/build_emscripten.sh          | 5 +++--
 scripts/docker/buildpack-deps/README.md | 2 ++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23fb3ae0a..af193b50f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,8 +21,8 @@ parameters:
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:048002d71a1f86f83dedb79dd057760b752256c75646ba5ad5c1bbe92e1695aa"
   emscripten-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-11
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0ad7c65e8c54d926ba9cb80d56246e4fc49f9284ad5188aaaa4834f46ab0c315"
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-12
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:65a82268792a5a2ee85ad432baf04a056c3a4006941ab3a4416eb1a0614883f3"
   evm-version:
     type: string
     default: london
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 841cc26b3..a678d08ab 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -34,7 +34,7 @@ else
     BUILD_DIR="$1"
 fi
 
-# solbuildpackpusher/solidity-buildpack-deps:emscripten-11
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-12
 docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:0ad7c65e8c54d926ba9cb80d56246e4fc49f9284ad5188aaaa4834f46ab0c315 \
+    solbuildpackpusher/solidity-buildpack-deps@sha256:65a82268792a5a2ee85ad432baf04a056c3a4006941ab3a4416eb1a0614883f3 \
     ./scripts/ci/build_emscripten.sh "$BUILD_DIR"
diff --git a/scripts/ci/build_emscripten.sh b/scripts/ci/build_emscripten.sh
index 6bc1754f3..f2e475c2a 100755
--- a/scripts/ci/build_emscripten.sh
+++ b/scripts/ci/build_emscripten.sh
@@ -62,11 +62,12 @@ then
 	echo -n "$CIRCLE_SHA1" >commit_hash.txt
 fi
 
-# Disable warnings for unqualified "move()" calls, introduced and enabled by
+# Disable warnings for unqualified `move()` calls, introduced and enabled by
 # default in clang-16 which is what the emscripten docker image uses.
 # Additionally, disable the warning for unknown warnings here, as this script is
 # also used with earlier clang versions.
-CMAKE_CXX_FLAGS="-Wno-unqualified-std-cast-call -Wno-unknown-warning-option"
+# TODO: This can be removed if and when all usages of `move()` in our codebase use the `std::` qualifier.
+CMAKE_CXX_FLAGS="-Wno-unqualified-std-cast-call"
 
 
 mkdir -p "$BUILD_DIR"
diff --git a/scripts/docker/buildpack-deps/README.md b/scripts/docker/buildpack-deps/README.md
index bce45e615..7f6352581 100644
--- a/scripts/docker/buildpack-deps/README.md
+++ b/scripts/docker/buildpack-deps/README.md
@@ -35,3 +35,5 @@ These scripts `scripts/ci/build.sh` and `scripts/ci/build_ossfuzz.sh` are also u
 If the tests passed successfully, the docker image will get tagged by the version defined within the corresponding `Dockerfile`.
 Finally, a comment will be added to the PR that contains the full repository, version and repository digest
 of the freshly created docker image.
+
+The files `.circleci/config.yml` and `scripts/build_emscripten.sh` need to be updated with the new hash posted in the comment.