fix: remaining refs to clang15

AztecProtocol · Sep 6, 2023 · e151e52 · e151e52
1 parent 28a877b
commit e151e52
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 28 deletions.
diff --git a/circuits/cpp/barretenberg/barretenberg.code-workspace b/circuits/cpp/barretenberg/barretenberg.code-workspace
@@ -151,7 +151,7 @@
             "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
         },
         "cmake.configureArgs": [
-            "--preset clang15",
+            "--preset clang16",
             "-G Ninja",
             "-g"
         ],

diff --git a/circuits/cpp/barretenberg/cpp/bootstrap.sh b/circuits/cpp/barretenberg/cpp/bootstrap.sh
@@ -35,7 +35,7 @@ if [ "$OS" == "macos" ]; then
   PRESET=default
 else
   if [ "$(which clang++-15)" != "" ]; then
-    PRESET=clang15
+    PRESET=clang16
   else
     PRESET=default
   fi

diff --git a/...ts/cpp/barretenberg/cpp/dockerfiles/Dockerfile.circuits-x86_64-linux-clang-builder-runner b/...ts/cpp/barretenberg/cpp/dockerfiles/Dockerfile.circuits-x86_64-linux-clang-builder-runner
@@ -2,16 +2,16 @@ FROM alpine:3.17
 RUN apk update \
     && apk upgrade \
     && apk add --no-cache \
-        bash \
-        build-base \
-        clang15 \
-        openmp \
-        openmp-dev \
-        cmake \
-        ninja \
-        git \
-        curl \
-        perl
+    bash \
+    build-base \
+    clang16 \
+    openmp \
+    openmp-dev \
+    cmake \
+    ninja \
+    git \
+    curl \
+    perl
 
 WORKDIR /usr/src/barretenberg/cpp
 

diff --git a/circuits/cpp/barretenberg/sol/Dockerfile b/circuits/cpp/barretenberg/sol/Dockerfile
@@ -1,15 +1,15 @@
 FROM alpine:3.17
 RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache \
-        build-base \
-        clang15 \
-        openmp-dev \
-        cmake \
-        ninja \
-        git \
-        curl \
-        perl
+  && apk upgrade \
+  && apk add --no-cache \
+  build-base \
+  clang16 \
+  openmp-dev \
+  cmake \
+  ninja \
+  git \
+  curl \
+  perl
 
 WORKDIR /usr/src/barretenberg/cpp
 

diff --git a/circuits/cpp/barretenberg/sol/bootstrap.sh b/circuits/cpp/barretenberg/sol/bootstrap.sh
@@ -18,8 +18,8 @@ cd ../../sol
 
 echo "Building c++ binaries..."
 cd ../cpp
-cmake --preset clang15
-cmake --build --preset clang15 --target solidity_key_gen solidity_proof_gen
+cmake --preset clang16
+cmake --build --preset clang16 --target solidity_key_gen solidity_proof_gen
 cd ../sol
 
 echo "Generating keys..."

diff --git a/circuits/cpp/barretenberg/sol/lib/forge-std b/circuits/cpp/barretenberg/sol/lib/forge-std
diff --git a/circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts b/circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts
diff --git a/l1-contracts/lib/forge-std b/l1-contracts/lib/forge-std
diff --git a/l1-contracts/lib/openzeppelin-contracts b/l1-contracts/lib/openzeppelin-contracts
+6 −48		.github/workflows/ci.yml
+0 −29		.github/workflows/sync.yml
+1 −1		foundry.toml
+1 −1		package.json
+3 −5		src/Base.sol
+2 −3		src/Script.sol
+12 −8		src/StdChains.sol
+17 −183		src/StdCheats.sol
+1 −1		src/StdInvariant.sol
+0 −4		src/StdStorage.sol
+2 −2		src/StdStyle.sol
+1 −6		src/StdUtils.sol
+2 −4		src/Test.sol
+10 −91		src/Vm.sol
+382 −394		src/console2.sol
+0 −13,248		src/safeconsole.sol
+36 −91		test/StdChains.t.sol
+13 −197		test/StdCheats.t.sol
+2 −17		test/StdMath.t.sol
+0 −10		test/StdStorage.t.sol
+4 −4		test/StdStyle.t.sol
+8 −53		test/StdUtils.t.sol