From 471c6ffd39cf4e89eb3005f6cca8697e0327d0bd Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 1 Mar 2021 15:46:16 -0700
Subject: [PATCH 1/3] fix(ci): remove release and test artifacts as a step

This adds a step to remove both the release packages and the test artifacts as
a step at the end of test in ci.yaml.
---
 .github/workflows/ci.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 838a0ba62c51..b101b3b2d4f3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -48,6 +48,9 @@ jobs:
         with:
           name: test-videos
           path: ./test/videos
+      - name: Remove release packages and test artifacts
+          run: |
+            rm -rf ./release-packages ./test/videos
 
   release:
     runs-on: ubuntu-latest

From 5e08d7f85374435be06fb5ee61f9a4735a7476ba Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 1 Mar 2021 15:50:07 -0700
Subject: [PATCH 2/3] fix(ci): remove docker images in linux-arm64

This adds a step to remove the docker images and hopefully free up space in the
linux-arm64 part of ci.
---
 .github/workflows/ci.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b101b3b2d4f3..a634cc3f15b9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -49,8 +49,7 @@ jobs:
           name: test-videos
           path: ./test/videos
       - name: Remove release packages and test artifacts
-          run: |
-            rm -rf ./release-packages ./test/videos
+        run: rm -rf ./release-packages ./test/videos
 
   release:
     runs-on: ubuntu-latest
@@ -105,6 +104,10 @@ jobs:
         with:
           name: release-packages
           path: ./release-packages
+      - name: Remove docker images
+        run: |
+          docker rm $(docker ps -aq)
+          docker rmi $(docker images -q)
 
   macos-amd64:
     needs: release

From 90807e19e77eb7f99474ea274dade7f791f64071 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 1 Mar 2021 16:57:02 -0700
Subject: [PATCH 3/3] fix(ci): replace extension in test standalone

---
 .github/workflows/ci.yaml           | 4 +---
 ci/build/test-standalone-release.sh | 7 ++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a634cc3f15b9..ac9a2088a09e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -105,9 +105,7 @@ jobs:
           name: release-packages
           path: ./release-packages
       - name: Remove docker images
-        run: |
-          docker rm $(docker ps -aq)
-          docker rmi $(docker images -q)
+        run: docker system prune -af
 
   macos-amd64:
     needs: release
diff --git a/ci/build/test-standalone-release.sh b/ci/build/test-standalone-release.sh
index 5f5656486dff..818aac8b99cf 100755
--- a/ci/build/test-standalone-release.sh
+++ b/ci/build/test-standalone-release.sh
@@ -12,11 +12,12 @@ main() {
 
   echo "Testing standalone release."
 
-  ./release-standalone/bin/code-server --extensions-dir "$EXTENSIONS_DIR" --install-extension ms-python.python
+  # Note: using a basic theme extension because it doesn't update often and is more reliable for testing
+  ./release-standalone/bin/code-server --extensions-dir "$EXTENSIONS_DIR" --install-extension wesbos.theme-cobalt2
   local installed_extensions
   installed_extensions="$(./release-standalone/bin/code-server --extensions-dir "$EXTENSIONS_DIR" --list-extensions 2>&1)"
-  # We use grep as ms-python.python may have dependency extensions that change.
-  if ! echo "$installed_extensions" | grep -q "ms-python.python"; then
+  # We use grep as wesbos.theme-cobalt2 may have dependency extensions that change.
+  if ! echo "$installed_extensions" | grep -q "wesbos.theme-cobalt2"; then
     echo "Unexpected output from listing extensions:"
     echo "$installed_extensions"
     exit 1