From 5f53639ac3c1783583686e50119514797429ae60 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Sun, 27 Feb 2022 09:00:12 +0800
Subject: [PATCH] refactor

---
 .github/workflows/tests-e2e.yml | 12 ++----------
 admin/scripts/test-release.sh   |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/tests-e2e.yml b/.github/workflows/tests-e2e.yml
index c03433df1137..e30bb24d0637 100644
--- a/.github/workflows/tests-e2e.yml
+++ b/.github/workflows/tests-e2e.yml
@@ -31,8 +31,6 @@ jobs:
         run: yarn
       - name: Generate test-website project against main branch
         run: yarn test:build:website -s
-        env:
-          KEEP_CONTAINER: true
       - name: Install test-website project with Yarn v1
         run: yarn install
         working-directory: ../test-website
@@ -69,10 +67,8 @@ jobs:
           cache: yarn
       - name: Installation
         run: yarn
-      - name: Generate test-website project in ${{ matrix.variant }} against main branch
+      - name: Generate test-website project with ${{ matrix.variant }} against main branch
         run: yarn test:build:website ${{ matrix.variant }}
-        env:
-          KEEP_CONTAINER: true
       - name: Install test-website project with Yarn Berry and nodeLinker = ${{ matrix.nodeLinker }}
         run: |
           yarn set version berry
@@ -99,7 +95,7 @@ jobs:
         env:
           E2E_TEST: true
       - name: Type check
-        if: matrix.variant.name == 'TS'
+        if: matrix.variant == '-st'
         run: yarn typecheck
         working-directory: ../test-website
       - name: Build test-website project
@@ -121,8 +117,6 @@ jobs:
         run: yarn
       - name: Generate test-website project against main branch
         run: yarn test:build:website -s
-        env:
-          KEEP_CONTAINER: true
       - name: Install test-website project with NPM
         run: npm install
         working-directory: ../test-website
@@ -152,8 +146,6 @@ jobs:
         run: yarn
       - name: Generate test-website project against main branch
         run: yarn test:build:website -s
-        env:
-          KEEP_CONTAINER: true
       - name: Install test-website project with PNPM
         run: |
           curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm
diff --git a/admin/scripts/test-release.sh b/admin/scripts/test-release.sh
index 2931b33ff087..1b968aca8660 100755
--- a/admin/scripts/test-release.sh
+++ b/admin/scripts/test-release.sh
@@ -55,7 +55,7 @@ cd ..
 npm_config_registry="$CUSTOM_REGISTRY_URL" npx create-docusaurus@"$NEW_VERSION" test-website classic $EXTRA_OPTS
 
 # Stop Docker container
-if [[ -z "${KEEP_CONTAINER:-}" ]] && ( $(docker container inspect "$CONTAINER_NAME" > /dev/null 2>&1) ); then
+if [[ -z "${KEEP_CONTAINER:-true}" ]] && ( $(docker container inspect "$CONTAINER_NAME" > /dev/null 2>&1) ); then
   # Remove Docker container
   docker container stop $CONTAINER_NAME > /dev/null
 fi