From fe118abb5351b4265ea87ef2a2717922b310866c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 24 May 2022 15:27:15 +0200
Subject: [PATCH] CI: Switch from deprecated circleci/buildpack-deps image to
 cimg/base

---
 .circleci/config.yml                          | 45 +++++++++++--------
 scripts/bytecodecompare/storebytecode.sh      |  3 ++
 .../bytecode_reports_for_modified_binaries.sh |  3 ++
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e7c64b1b6..6efc45f73 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -356,17 +356,9 @@ defaults:
         TERM: xterm
         MAKEFLAGS: -j 10
 
-  - base_buildpack_focal_small: &base_buildpack_focal_small
+  - base_cimg_small: &base_cimg_small
       docker:
-        - image: buildpack-deps:focal
-      resource_class: small
-      environment:
-        TERM: xterm
-        MAKEFLAGS: -j 2
-
-  - base_buildpack_latest_small: &base_buildpack_latest_small
-      docker:
-        - image: buildpack-deps:latest
+        - image: cimg/base:current
       resource_class: small
       environment:
         TERM: xterm
@@ -681,12 +673,14 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_coding_style:
-    <<: *base_buildpack_focal_small
+    <<: *base_cimg_small
     steps:
       - checkout
       - run:
           name: Install shellcheck
-          command: apt -q update && apt install -y shellcheck
+          command: |
+            sudo apt -q update
+            sudo apt install -y shellcheck
       - run:
           name: Check for C++ coding style
           command: ./scripts/check_style.sh
@@ -708,12 +702,14 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_pylint:
-    <<: *base_buildpack_focal_small
+    <<: *base_cimg_small
     steps:
       - checkout
       - run:
           name: Install pip
-          command: apt -q update && apt install -y python3-pip
+          command: |
+            sudo apt -q update
+            sudo apt install -y python3-pip
       - run:
           name: Install pylint and dependencies of the scripts that will be linted
           command: python3 -m pip install
@@ -732,12 +728,14 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_antlr_grammar:
-    <<: *base_buildpack_focal_small
+    <<: *base_cimg_small
     steps:
       - checkout
       - run:
           name: Install Java
-          command: apt -q update && apt install -y openjdk-16-jdk
+          command: |
+            sudo apt -q update
+            sudo apt install -y openjdk-16-jdk
       - run:
           name: Run tests
           command: ./scripts/test_antlr_grammar.sh
@@ -759,14 +757,14 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_proofs:
-    <<: *base_buildpack_latest_small
+    <<: *base_cimg_small
     steps:
       - checkout
       - run:
           name: Z3 python deps
           command: |
-            apt-get -qq update
-            apt-get -qy install python3-pip
+            sudo apt-get -qq update
+            sudo apt-get -qy install python3-pip
             pip3 install --user z3-solver
       - run: *run_proofs
       - gitter_notify_failure_unless_pr
@@ -1405,6 +1403,10 @@ jobs:
 
   b_bytecode_ubu:
     <<: *base_ubuntu2004_small
+    environment:
+      TERM: xterm
+      MAKEFLAGS: -j 2
+      LC_ALL: C
     steps:
       - checkout
       - attach_workspace:
@@ -1414,6 +1416,10 @@ jobs:
 
   b_bytecode_osx:
     <<: *base_osx
+    environment:
+      TERM: xterm
+      MAKEFLAGS: -j 5
+      LC_ALL: C
     steps:
       - checkout
       - attach_workspace:
@@ -1449,6 +1455,7 @@ jobs:
     <<: *base_node_small
     environment:
       SOLC_EMSCRIPTEN: "On"
+      LC_ALL: C
     steps:
       - checkout
       - attach_workspace:
diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
index 2192960e4..beeb79d09 100755
--- a/scripts/bytecodecompare/storebytecode.sh
+++ b/scripts/bytecodecompare/storebytecode.sh
@@ -35,6 +35,9 @@ REPO_ROOT=$(pwd) # make it absolute
 
 BUILD_DIR="${1:-${REPO_ROOT}/build}"
 
+# Set locale to C to prevent it from affecting glob sort order.
+export LC_ALL=C
+
 echo "Compiling all test contracts into bytecode..."
 TMPDIR=$(mktemp -d)
 (
diff --git a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
index 68ab995af..92c522f8f 100755
--- a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
+++ b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
@@ -104,6 +104,9 @@ tmp_dir=$(mktemp -d -t bytecode-reports-XXXXXX)
 solcjs_dir="$tmp_dir/solcjs"
 script_dir="$solidity_dir/scripts"
 
+# Set locale to C to prevent it from affecting glob sort order.
+export LC_ALL=C
+
 cd "$tmp_dir"
 
 git clone https://github.com/ethereum/solc-js.git "$solcjs_dir"