Skip to content

Commit 484c9d3

Browse files
committed
Update docker images for emscripten.
1 parent c4d9cdf commit 484c9d3

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ parameters:
2121
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:048002d71a1f86f83dedb79dd057760b752256c75646ba5ad5c1bbe92e1695aa"
2222
emscripten-docker-image:
2323
type: string
24-
# solbuildpackpusher/solidity-buildpack-deps:emscripten-11
25-
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0ad7c65e8c54d926ba9cb80d56246e4fc49f9284ad5188aaaa4834f46ab0c315"
24+
# solbuildpackpusher/solidity-buildpack-deps:emscripten-12
25+
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:65a82268792a5a2ee85ad432baf04a056c3a4006941ab3a4416eb1a0614883f3"
2626
evm-version:
2727
type: string
2828
default: london

scripts/build_emscripten.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ else
3434
BUILD_DIR="$1"
3535
fi
3636

37-
# solbuildpackpusher/solidity-buildpack-deps:emscripten-11
37+
# solbuildpackpusher/solidity-buildpack-deps:emscripten-12
3838
docker run -v "$(pwd):/root/project" -w /root/project \
39-
solbuildpackpusher/solidity-buildpack-deps@sha256:0ad7c65e8c54d926ba9cb80d56246e4fc49f9284ad5188aaaa4834f46ab0c315 \
39+
solbuildpackpusher/solidity-buildpack-deps@sha256:65a82268792a5a2ee85ad432baf04a056c3a4006941ab3a4416eb1a0614883f3 \
4040
./scripts/ci/build_emscripten.sh "$BUILD_DIR"

scripts/ci/build_emscripten.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,12 @@ then
6262
echo -n "$CIRCLE_SHA1" >commit_hash.txt
6363
fi
6464

65-
# Disable warnings for unqualified "move()" calls, introduced and enabled by
65+
# Disable warnings for unqualified `move()` calls, introduced and enabled by
6666
# default in clang-16 which is what the emscripten docker image uses.
6767
# Additionally, disable the warning for unknown warnings here, as this script is
6868
# also used with earlier clang versions.
69-
CMAKE_CXX_FLAGS="-Wno-unqualified-std-cast-call -Wno-unknown-warning-option"
69+
# TODO: This can be removed if and when all usages of `move()` in our codebase use the `std::` qualifier.
70+
CMAKE_CXX_FLAGS="-Wno-unqualified-std-cast-call"
7071

7172

7273
mkdir -p "$BUILD_DIR"

scripts/docker/buildpack-deps/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ These scripts `scripts/ci/build.sh` and `scripts/ci/build_ossfuzz.sh` are also u
3535
If the tests passed successfully, the docker image will get tagged by the version defined within the corresponding `Dockerfile`.
3636
Finally, a comment will be added to the PR that contains the full repository, version and repository digest
3737
of the freshly created docker image.
38+
39+
The files `.circleci/config.yml` and `scripts/build_emscripten.sh` need to be updated with the new hash posted in the comment.

0 commit comments

Comments
 (0)