From 78f5bd9f5d07a52abf577eaa5eb319b04359d677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Guti=C3=A9rrez=20Hermoso?= <jordigh@octave.org>
Date: Wed, 10 Jul 2024 13:08:19 -0400
Subject: [PATCH] workflow: conditionally restore ext/ directory

Now that we *have* to have something in the ext directory, we need to
either restore the external ext or the default OSS ext depending on
which build we are doing.
---
 .github/workflows/docker_latest.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker_latest.yml b/.github/workflows/docker_latest.yml
index d72682cf..0320eb5b 100644
--- a/.github/workflows/docker_latest.yml
+++ b/.github/workflows/docker_latest.yml
@@ -111,19 +111,21 @@ jobs:
         if: ${{ !inputs.disable_tests }}
         run: yarn install
 
+      - name: Disable the ext/ directory
+        if: ${{ !inputs.disable_tests }}
+        run: mv ext/ ext-disabled/
+
       - name: Build Node.js code
         if: ${{ !inputs.disable_tests }}
-        run: |
-          rm -rf ext
-          yarn run build:prod
+        run: yarn run build:prod
 
       - name: Run tests
         if: ${{ !inputs.disable_tests }}
         run: TEST_IMAGE=${{ env.DOCKER_HUB_OWNER }}/${{ matrix.image.name }}:${{ env.TAG }} VERBOSE=1 DEBUG=1 MOCHA_WEBDRIVER_HEADLESS=1 yarn run test:docker
 
-      - name: Restore the ext/ directory
-        if: ${{ matrix.image.name != 'grist-oss' && !inputs.disable_tests }}
-        run: buildtools/checkout-ext-directory.sh ${{ matrix.image.repo }}
+      - name: Re-enable the ext/ directory
+        if: ${{ !inputs.disable_tests }}
+        run: mv ext-disabled/ ext/
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v1