From 0247a59e788b4f701d7f69766b01c6889f3da4b8 Mon Sep 17 00:00:00 2001
From: discoursebot <team@discourse.org>
Date: Mon, 7 Nov 2022 15:13:01 -0500
Subject: [PATCH] DEV: Update CI workflows (#12)

Co-authored-by: discoursebuild <build@discourse.org>
---
 .github/workflows/component-linting.yml | 8 ++++----
 .github/workflows/component-tests.yml   | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/component-linting.yml b/.github/workflows/component-linting.yml
index 2385132..f70a72c 100644
--- a/.github/workflows/component-linting.yml
+++ b/.github/workflows/component-linting.yml
@@ -20,18 +20,18 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: yarn
 
       - name: Yarn install
         run: yarn install
 
       - name: ESLint
-        if: ${{ always() }}
+        if: ${{ !cancelled() }}
         run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern {test,javascripts}
 
       - name: Prettier
-        if: ${{ always() }}
+        if: ${{ !cancelled() }}
         shell: bash
         run: |
           yarn prettier -v
@@ -44,5 +44,5 @@ jobs:
           fi
 
       - name: Ember template lint
-        if: ${{ always() }}
+        if: ${{ !cancelled() }}
         run: yarn ember-template-lint --no-error-on-unmatched-pattern javascripts
diff --git a/.github/workflows/component-tests.yml b/.github/workflows/component-tests.yml
index 944aa1e..5bde9a3 100644
--- a/.github/workflows/component-tests.yml
+++ b/.github/workflows/component-tests.yml
@@ -139,9 +139,14 @@ jobs:
         if: steps.app-cache.outputs.cache-hit != 'true'
         run: rm -rf tmp/app-cache/uploads && cp -r public/uploads tmp/app-cache/uploads
 
+      - name: Create theme archive
+        run: |
+          cd tmp/component
+          git archive --format=tar.gz HEAD > ../../theme.tar.gz
+
       - name: Component QUnit
         run: |
           THEME_NAME=$(ruby -e 'require "json"; puts JSON.parse(File.read("tmp/component/about.json"))["name"]')
-          bundle exec rake themes:install -- "--{\"$THEME_NAME\": \"tmp/component\"}"
+          THEME_ARCHIVE=theme.tar.gz bundle exec rake themes:install:archive
           UNICORN_TIMEOUT=120 bundle exec rake "themes:qunit[name,$THEME_NAME]"
         timeout-minutes: 10