Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nightly CI to work with c++20 and restrict some tests to >= constantinople #15797

Merged
merged 3 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,8 @@ jobs:
# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105562#c27
CMAKE_OPTIONS: -DSANITIZE=address -DPEDANTIC=OFF
CMAKE_BUILD_TYPE: Release
# Set the number of jobs to two instead of the default three, so that we do not run out of memory
MAKEFLAGS: -j 2
steps:
- build

Expand Down
4 changes: 2 additions & 2 deletions scripts/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ MAINTAINER chriseth <chris@ethereum.org>
WORKDIR /solidity

# Build dependencies
RUN apk update && apk add boost-dev boost-static build-base cmake git
RUN apk update && apk add boost-dev boost-static build-base cmake git clang

#Copy working directory on travis to the image
COPY / $WORKDIR
Expand All @@ -17,7 +17,7 @@ ARG BUILD_CONCURRENCY="0"

#Install dependencies, eliminate annoying warnings
RUN sed -i -E -e 's/include <sys\/poll.h>/include <poll.h>/' /usr/include/boost/asio/detail/socket_types.hpp
RUN cmake -DCMAKE_BUILD_TYPE=Release -DTESTS=0 -DSOLC_LINK_STATIC=1
RUN cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DTESTS=0 -DSOLC_LINK_STATIC=1
RUN make solc \
-j$(awk "BEGIN { \
if (${BUILD_CONCURRENCY} != 0) { \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ contract C {
return true;
}
}
// ====
// EVMVersion: >=constantinople
// ----
// f(), 2000 ether -> true
// gas irOptimized: 117688
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ contract C {
}
}
// ====
// EVMVersion: >=byzantium
// EVMVersion: >=constantinople
// ----
// constructor(), 20 wei
// gas irOptimized: 59688
Expand Down
2 changes: 2 additions & 0 deletions test/libsolidity/semanticTests/immutable/multi_creation.sol
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ contract C {
return (a, (new A{salt: hex"01"}()).f(), (new B{salt: hex"01"}()).f());
}
}
// ====
// EVMVersion: >=constantinople
// ----
// f() -> 3, 7, 5
// gas irOptimized: 86892
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ contract D {
return (new C{salt: hex"01"}()).transfer(5);
}
}
// ====
// EVMVersion: >=constantinople
// ----
// f() -> 1
// gas irOptimized: 77051
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ contract A {
return d.getX();
}
}
// ====
// EVMVersion: >=constantinople
// ----
// g(int256): -1 -> -1
// gas legacy: 77955
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ contract C {
return -x;
}
}
// ====
// EVMVersion: >=constantinople
// ----
// testMul(int32,int32): 42, 10 -> 420
// gas irOptimized: 102563
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ contract C {
return -x;
}
}
// ====
// EVMVersion: >=constantinople
// ----
// testMul(int32,int32): 42, 10 -> 420
// gas irOptimized: 102563
Expand Down
2 changes: 2 additions & 0 deletions test/libsolidity/semanticTests/various/many_subassemblies.sol
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ contract D {
new C10{salt: hex"0a"}();
}
}
// ====
// EVMVersion: >=constantinople
// ----
// run() ->
// gas irOptimized: 375192
Expand Down