From 0b7563b8046f0e98116f4f1168d501fe83cdc3db Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 4 Jun 2024 15:16:44 +0200 Subject: [PATCH] DEV: Fix the order of operations in themes-frontend (#27317) Previously "themes frontend" CI job would: 1. pull compatible versions of themes that happened to be in the base image 2. clone all official themes (overriding the compatible versions from 1.) 3. run tests --- .github/workflows/tests.yml | 6 +----- lib/tasks/themes.rake | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 96859e26b2a..9cfe48426dd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -147,12 +147,8 @@ jobs: key: ${{ runner.os }}-plugin-gems-${{ steps.container-envs.outputs.ruby_version }}-${{ steps.container-envs.outputs.debian_release }}-${{ hashFiles('plugins/*/plugin.rb') }} - name: Checkout official themes - if: matrix.target == 'themes' && matrix.build_type == 'system' - run: bin/rake themes:clone_all_official - - - name: Pull compatible versions of themes if: matrix.target == 'themes' - run: bin/rake themes:pull_compatible_all + run: bin/rake themes:clone_all_official themes:pull_compatible_all - name: Add hosts to /etc/hosts, otherwise Chromium cannot reach minio if: matrix.build_type == 'system' && matrix.target == 'core' diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake index 5d256082e17..9b49eaca1bb 100644 --- a/lib/tasks/themes.rake +++ b/lib/tasks/themes.rake @@ -255,7 +255,7 @@ end # Note that this should only be used in CI where it is safe to mutate the database without rolling back since running # the themes QUnit tests requires the themes to be installed in the database. desc "Runs qunit tests for all official themes" -task "themes:qunit_all_official" => ["themes:clone_all_official", :environment] do |task, args| +task "themes:qunit_all_official" => :environment do |task, args| theme_ids_with_qunit_tests = [] ThemeMetadata::OFFICIAL_THEMES.each do |theme_name|