From 4dcede91e7d5b3c81e390946caad43b4426d2bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Mon, 30 Jan 2023 21:31:44 +0800
Subject: [PATCH 01/21] Try to upgrade to Ubuntu22.04

---
 .circleci/config.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d8f0e7a5ca..af496d98b4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,13 +4,13 @@ orbs:
   win: circleci/windows@1.0.0
 
 executors:
-  bionic:
+  ubuntu:
     docker:
-      - image: buildpack-deps:bionic
+      - image: ubuntu-2204:current
 
 jobs:
   flake8:
-    executor: bionic
+    executor: ubuntu
     steps:
       - checkout
       - run:
@@ -25,7 +25,7 @@ jobs:
       - run: python2 -m flake8 --show-source --statistics
       - run: python3 -m flake8 --show-source --statistics
   test-linux:
-    executor: bionic
+    executor: ubuntu
     environment:
       EMSDK_NOTTY: "1"
       # This is needed because the old gcc-7 that is installed on debian/bionic
@@ -134,7 +134,7 @@ jobs:
             test/test_path_preservation.ps1
 
   build-docker-image:
-    executor: bionic
+    executor: ubuntu
     steps:
       - checkout
       - run:
@@ -150,7 +150,7 @@ jobs:
           command: make -C ./docker version=tot test
 
   publish-docker-image:
-    executor: bionic
+    executor: ubuntu
     steps:
       - checkout
       - run:
@@ -170,7 +170,7 @@ jobs:
             make -C ./docker version=${CIRCLE_TAG} alias=latest push
 
   test-bazel-linux:
-    executor: bionic
+    executor: ubuntu
     steps:
       - checkout
       - run: apt-get install -q -y curl gnupg

From fb5f34dc1dd419379dea7bd8a07a379e0605947e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Mon, 30 Jan 2023 21:37:05 +0800
Subject: [PATCH 02/21] Fix errors

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index af496d98b4..6ccb8b84cd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ orbs:
 executors:
   ubuntu:
     docker:
-      - image: ubuntu-2204:current
+      - image: buildpack-deps:jammy
 
 jobs:
   flake8:

From b9bd24570495327c38ca82194d44b507eef07f2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Mon, 30 Jan 2023 22:01:56 +0800
Subject: [PATCH 03/21] Remove Python2 in flake8 job

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6ccb8b84cd..16028e9301 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,12 +17,12 @@ jobs:
           name: install pip
           command: |
             apt-get update -q
-            apt-get install -q -y python-pip python3-pip
-      - run: python2 -m pip install --upgrade pip
+            apt-get install -q -y python3-pip
+#      - run: python2 -m pip install --upgrade pip
       - run: python3 -m pip install --upgrade pip
-      - run: python2 -m pip install flake8==3.7.8
+#      - run: python2 -m pip install flake8==3.7.8
       - run: python3 -m pip install flake8==3.7.8
-      - run: python2 -m flake8 --show-source --statistics
+#      - run: python2 -m flake8 --show-source --statistics
       - run: python3 -m flake8 --show-source --statistics
   test-linux:
     executor: ubuntu

From d9f78acc974f458936e06e0eb9fa60017d6f81d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Mon, 30 Jan 2023 22:08:01 +0800
Subject: [PATCH 04/21] Update Linux job

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 16028e9301..42a6077536 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,7 +39,7 @@ jobs:
       - checkout
       - run:
           name: Install debian packages
-          command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless ksh zsh
+          command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless ksh zsh python-is-python3
       - run: test/test.sh
       - run: test/test_source_env.sh
       - run:

From 87704c7a2ec9c5efc2bf1b228d81bf0d317949b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Mon, 6 Feb 2023 22:39:23 +0800
Subject: [PATCH 05/21] Update config.yml

---
 .circleci/config.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 42a6077536..eb50ead882 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,11 +18,12 @@ jobs:
           command: |
             apt-get update -q
             apt-get install -q -y python3-pip
-#      - run: python2 -m pip install --upgrade pip
+            apt-get install -q -y python-pip
+      - run: python2 -m pip install --upgrade pip
       - run: python3 -m pip install --upgrade pip
-#      - run: python2 -m pip install flake8==3.7.8
+      - run: python2 -m pip install flake8==3.7.8
       - run: python3 -m pip install flake8==3.7.8
-#      - run: python2 -m flake8 --show-source --statistics
+      - run: python2 -m flake8 --show-source --statistics
       - run: python3 -m flake8 --show-source --statistics
   test-linux:
     executor: ubuntu

From 61b1a753cdd0667ed49465f66b5c789fac33a446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Mon, 6 Feb 2023 22:44:17 +0800
Subject: [PATCH 06/21] Recover python2 checks

---
 .circleci/config.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index eb50ead882..db227b80e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,17 +14,19 @@ jobs:
     steps:
       - checkout
       - run:
-          name: install pip
+          name: install pip3
           command: |
             apt-get update -q
             apt-get install -q -y python3-pip
-            apt-get install -q -y python-pip
-      - run: python2 -m pip install --upgrade pip
       - run: python3 -m pip install --upgrade pip
-      - run: python2 -m pip install flake8==3.7.8
       - run: python3 -m pip install flake8==3.7.8
-      - run: python2 -m flake8 --show-source --statistics
       - run: python3 -m flake8 --show-source --statistics
+      - run: 
+          name: install pip2
+          command: apt-get install -q -y python-pip
+      - run: python2 -m pip install --upgrade pip
+      - run: python2 -m pip install flake8==3.7.8
+      - run: python2 -m flake8 --show-source --statistics
   test-linux:
     executor: ubuntu
     environment:

From eb70195ab610a5d8ba22b2b5570391d462d88b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Tue, 7 Feb 2023 00:38:04 +0800
Subject: [PATCH 07/21] Switch to the new docker installation

---
 .circleci/config.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index db227b80e5..34e3aeeb22 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -142,7 +142,14 @@ jobs:
       - checkout
       - run:
           name: install docker
-          command: apt-get update -q && apt-get install -q -y docker.io
+          command: |
+            apt-get update -q 
+            apt-get install -q -y ca-certificates curl gnupg lsb-release
+            mkdir -p /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+            apt-get update -q
+            sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
       - setup_remote_docker
       # Build and test the tip-of-tree build of EMSDK
       - run:
@@ -158,7 +165,14 @@ jobs:
       - checkout
       - run:
           name: install docker
-          command: apt-get update -q && apt-get install -q -y docker.io
+          command: |
+            apt-get update -q 
+            apt-get install -q -y ca-certificates curl gnupg lsb-release
+            mkdir -p /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+            apt-get update -q
+            sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
       - setup_remote_docker
       - run:
           name: build

From 7fee8faf4cc5b0796bcb7e8c59ba5cc60312b2a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Tue, 7 Feb 2023 01:15:17 +0800
Subject: [PATCH 08/21] Fix error in Docker installation

---
 .circleci/config.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 34e3aeeb22..2aaab7183a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -146,10 +146,10 @@ jobs:
             apt-get update -q 
             apt-get install -q -y ca-certificates curl gnupg lsb-release
             mkdir -p /etc/apt/keyrings
-            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
             apt-get update -q
-            sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
+            apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
       - setup_remote_docker
       # Build and test the tip-of-tree build of EMSDK
       - run:
@@ -169,10 +169,10 @@ jobs:
             apt-get update -q 
             apt-get install -q -y ca-certificates curl gnupg lsb-release
             mkdir -p /etc/apt/keyrings
-            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
             apt-get update -q
-            sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
+            apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
       - setup_remote_docker
       - run:
           name: build

From 6aad75952698216fef7bf281dc971fc5d18f69c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Tue, 7 Feb 2023 01:25:58 +0800
Subject: [PATCH 09/21] Fix error

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2aaab7183a..40bc9369dd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -149,7 +149,7 @@ jobs:
             curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
             echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
             apt-get update -q
-            apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
+            apt-get install -q -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
       - setup_remote_docker
       # Build and test the tip-of-tree build of EMSDK
       - run:
@@ -172,7 +172,7 @@ jobs:
             curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
             echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
             apt-get update -q
-            apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
+            apt-get install -q -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
       - setup_remote_docker
       - run:
           name: build

From dacdaecb9b9db654d782ed5996f165ce9344d4f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Wed, 8 Feb 2023 11:11:08 +0800
Subject: [PATCH 10/21] Try to change Ubuntu to 20.04LTS(focal)

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 40bc9369dd..94367b813c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ orbs:
 executors:
   ubuntu:
     docker:
-      - image: buildpack-deps:jammy
+      - image: buildpack-deps:focal
 
 jobs:
   flake8:

From a2644839c8eb201171b3b5ac8124e6648fbf5440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Wed, 8 Feb 2023 12:02:14 +0800
Subject: [PATCH 11/21] Fix error in pip2 installation

---
 .circleci/config.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 94367b813c..6b787d437f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,16 +14,14 @@ jobs:
     steps:
       - checkout
       - run:
-          name: install pip3
+          name: install pip
           command: |
             apt-get update -q
             apt-get install -q -y python3-pip
+            curl -fsSL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2
       - run: python3 -m pip install --upgrade pip
       - run: python3 -m pip install flake8==3.7.8
       - run: python3 -m flake8 --show-source --statistics
-      - run: 
-          name: install pip2
-          command: apt-get install -q -y python-pip
       - run: python2 -m pip install --upgrade pip
       - run: python2 -m pip install flake8==3.7.8
       - run: python2 -m flake8 --show-source --statistics

From be8a151a26a5384a22718620b164b895f24933fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Wed, 8 Feb 2023 12:35:32 +0800
Subject: [PATCH 12/21] Change the min supported version to Ubuntu20.04

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6bb29d6fb1..3ab48e0090 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ https://emscripten.org/docs/building_from_source/toolchain_what_is_needed.html.
 - `python`: Version 2.7.0 or above.
 - `java`: For running closure compiler (optional)
 
-The emsdk pre-compiled binaries are built aginst Ubuntu/Xenial 16.04 LTS and
+The emsdk pre-compiled binaries are built aginst Ubuntu/Focal 20.04 LTS and
 therefore depend on system libraries compatiable with versions of `glibc` and
 `libstdc++` present in that release.  If your linux distribution is very old
 you may not be able to use the pre-compiled binaries packages.

From 920e6d3c6a2053be803917d7bb6ed9f2f5e10b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <dreamofice@outlook.com>
Date: Wed, 8 Feb 2023 13:32:09 +0800
Subject: [PATCH 13/21] Revert "Update Linux job"

This reverts commit d9f78acc974f458936e06e0eb9fa60017d6f81d7.
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6b787d437f..fd227c4b40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ jobs:
       - checkout
       - run:
           name: Install debian packages
-          command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless ksh zsh python-is-python3
+          command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless ksh zsh
       - run: test/test.sh
       - run: test/test_source_env.sh
       - run:

From 29f8cbeaf622842152e9ce5176357ca706d7a846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <dreamofice@outlook.com>
Date: Wed, 8 Feb 2023 13:33:33 +0800
Subject: [PATCH 14/21] Update test/test.py

---
 test/test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.py b/test/test.py
index 98557a6528..bb0dbbc129 100755
--- a/test/test.py
+++ b/test/test.py
@@ -220,7 +220,7 @@ def test_binaryen_from_source(self):
   def test_no_32bit(self):
     print('test 32-bit error')
     emsdk_hacked = hack_emsdk('not is_os_64bit()', 'True')
-    failing_call_with_output('python %s install latest' % emsdk_hacked, 'this tool is only provided for 64-bit OSes')
+    failing_call_with_output('%s %s install latest' % (sys.executable, emsdk_hacked), 'this tool is only provided for 64-bit OSes')
     os.remove(emsdk_hacked)
 
   def test_update_no_git(self):

From 16e32bb41b175c17eee05e5ace764d7fe15719cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <dreamofice@outlook.com>
Date: Thu, 9 Feb 2023 00:54:16 +0800
Subject: [PATCH 15/21] Revert "Switch to the new docker installation"

This reverts commit eb70195ab610a5d8ba22b2b5570391d462d88b38.
---
 .circleci/config.yml | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fd227c4b40..615fce1aa4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -140,15 +140,7 @@ jobs:
       - checkout
       - run:
           name: install docker
-          command: |
-            apt-get update -q 
-            apt-get install -q -y ca-certificates curl gnupg lsb-release
-            mkdir -p /etc/apt/keyrings
-            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-            apt-get update -q
-            apt-get install -q -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
-      - setup_remote_docker
+          command: apt-get update -q && apt-get install -q -y docker.io
       # Build and test the tip-of-tree build of EMSDK
       - run:
           name: build
@@ -163,14 +155,7 @@ jobs:
       - checkout
       - run:
           name: install docker
-          command: |
-            apt-get update -q 
-            apt-get install -q -y ca-certificates curl gnupg lsb-release
-            mkdir -p /etc/apt/keyrings
-            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-            apt-get update -q
-            apt-get install -q -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+          command: apt-get update -q && apt-get install -q -y docker.io
       - setup_remote_docker
       - run:
           name: build

From 2d1f231ff3ca848a70c82678498f61fa15f55ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <dreamofice@outlook.com>
Date: Thu, 9 Feb 2023 10:34:34 +0800
Subject: [PATCH 16/21] Revert "Revert "Switch to the new docker installation""

This reverts commit 16e32bb41b175c17eee05e5ace764d7fe15719cd.
---
 .circleci/config.yml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 615fce1aa4..fd227c4b40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -140,7 +140,15 @@ jobs:
       - checkout
       - run:
           name: install docker
-          command: apt-get update -q && apt-get install -q -y docker.io
+          command: |
+            apt-get update -q 
+            apt-get install -q -y ca-certificates curl gnupg lsb-release
+            mkdir -p /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+            apt-get update -q
+            apt-get install -q -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+      - setup_remote_docker
       # Build and test the tip-of-tree build of EMSDK
       - run:
           name: build
@@ -155,7 +163,14 @@ jobs:
       - checkout
       - run:
           name: install docker
-          command: apt-get update -q && apt-get install -q -y docker.io
+          command: |
+            apt-get update -q 
+            apt-get install -q -y ca-certificates curl gnupg lsb-release
+            mkdir -p /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+            apt-get update -q
+            apt-get install -q -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
       - setup_remote_docker
       - run:
           name: build

From bd19b8a478d5a2ec97672885e9d77599cf9439f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E9=9B=AA=E6=AE=87=E7=92=83=E9=99=8C=E6=A2=A6?=
 <80821706+DreamOfIce@users.noreply.github.com>
Date: Wed, 29 May 2024 00:22:25 +0800
Subject: [PATCH 17/21] fix: fix a typo

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 42c3c6825a..fe3f7c6b5e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -177,7 +177,7 @@ jobs:
             $env:SYSTEM_FLAG="--system"
             test/test_path_preservation.ps1
 
-build-docker-image-x64:
+  build-docker-image-x64:
     executor: ubuntu
     steps:
       - checkout

From ad7d28a57eb110cdafe6a82d1ced31541c71c310 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 28 May 2024 10:44:27 -0700
Subject: [PATCH 18/21] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 673f38c013..6a2557ed72 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ https://emscripten.org/docs/building_from_source/toolchain_what_is_needed.html.
 - `python`: Version 2.7.0 or above.
 - `java`: For running closure compiler (optional)
 
-The emsdk pre-compiled binaries are built aginst Ubuntu/Focal 20.04 LTS and
+The emsdk pre-compiled binaries are built against Ubuntu/Focal 20.04 LTS and
 therefore depend on system libraries compatiable with versions of `glibc` and
 `libstdc++` present in that release.  If your linux distribution is very old
 you may not be able to use the pre-compiled binaries packages.

From b045d23fdb4e79e9d87f8bbe45c7a6d3f54ab6a7 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 28 May 2024 10:44:56 -0700
Subject: [PATCH 19/21] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6a2557ed72..9736aea0a2 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ https://emscripten.org/docs/building_from_source/toolchain_what_is_needed.html.
 - `java`: For running closure compiler (optional)
 
 The emsdk pre-compiled binaries are built against Ubuntu/Focal 20.04 LTS and
-therefore depend on system libraries compatiable with versions of `glibc` and
+therefore depend on system libraries compatible with versions of `glibc` and
 `libstdc++` present in that release.  If your linux distribution is very old
 you may not be able to use the pre-compiled binaries packages.
 

From 5446822c426c76d800bfbaf2e9ae9e1531f852de Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 28 May 2024 11:32:49 -0700
Subject: [PATCH 20/21] Update .circleci/config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fe3f7c6b5e..2fc4f4665f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,7 +54,7 @@ jobs:
     steps:
       - checkout
       - run:
-          name: install pip3
+          name: install pip
           command: |
             apt-get update -q
             apt-get install -q -y python3-pip

From bc99127450315450548cb6c64ba2a8cc70022840 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 28 May 2024 11:33:01 -0700
Subject: [PATCH 21/21] Update .circleci/config.yml

---
 .circleci/config.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2fc4f4665f..31f090e68b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,12 +61,6 @@ jobs:
       - run: python3 -m pip install --upgrade pip
       - run: python3 -m pip install flake8==3.9.2
       - run: python3 -m flake8 --show-source --statistics --extend-exclude=./scripts
-      - run: 
-          name: install pip2
-          command: apt-get install -q -y python-pip
-      - run: python2 -m pip install --upgrade pip
-      - run: python2 -m pip install flake8==3.9.2
-      - run: python2 -m flake8 --show-source --statistics --extend-exclude=./scripts
 
   test-linux:
     executor: ubuntu