From fc5d096e70864ce4bc05e405cab5c3d5a93434ad Mon Sep 17 00:00:00 2001 From: kitcommerce <262714811+kitcommerce@users.noreply.github.com> Date: Fri, 20 Feb 2026 02:51:14 -0500 Subject: [PATCH 1/2] WA-NEW-012: Run CI on Ruby 3.2 (workarea-core requires >= 2.7) --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f953cf481..a84fbc218 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 3.2 bundler-cache: true - uses: workarea-commerce/ci/test@v1 with: @@ -40,7 +40,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 3.2 bundler-cache: true - uses: workarea-commerce/ci/test@v1 with: @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 3.2 bundler-cache: true - uses: workarea-commerce/ci/test@v1 with: @@ -69,7 +69,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 3.2 bundler-cache: true - uses: workarea-commerce/ci/test@v1 with: @@ -81,7 +81,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 3.2 bundler-cache: true - uses: workarea-commerce/ci/test@v1 with: @@ -93,7 +93,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 3.2 bundler-cache: true - uses: workarea-commerce/ci/test@v1 with: @@ -105,7 +105,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 3.2 bundler-cache: true - uses: workarea-commerce/ci/test@v1 with: @@ -117,7 +117,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 3.2 bundler-cache: true - uses: workarea-commerce/ci/test@v1 with: From 0eb35414c9a6dd9983274c76e779417d8cfcdf62 Mon Sep 17 00:00:00 2001 From: kitcommerce <262714811+kitcommerce@users.noreply.github.com> Date: Fri, 20 Feb 2026 03:07:28 -0500 Subject: [PATCH 2/2] WA-NEW-012: Fix CI tooling (docker-compose + Ruby-based static analysis) --- .github/workflows/ci.yml | 41 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a84fbc218..28bb32a67 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,10 +11,21 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: workarea-commerce/ci/bundler-audit@v1 + + # Run Ruby-based static analysis on the same Ruby version as the rest of CI. + # The docker-based workarea-commerce/ci/* actions are pinned to ruby:2.6, + # which cannot bundle workarea-core (>= 2.7). + - uses: ruby/setup-ruby@v1 with: - args: '--ignore CVE-2020-8161' - - uses: workarea-commerce/ci/rubocop@v1 + ruby-version: 3.2 + bundler-cache: true + + - name: bundler-audit + run: bundle exec bundler-audit check --update --ignore CVE-2020-8161 + + - name: rubocop + run: bundle exec rubocop + - uses: workarea-commerce/ci/eslint@v1 with: args: '{admin,core,storefront}/{app,test}/**/*.js' @@ -30,6 +41,9 @@ jobs: with: ruby-version: 3.2 bundler-cache: true + + - name: Ensure docker-compose is installed + run: sudo apt-get update && sudo apt-get install -y docker-compose - uses: workarea-commerce/ci/test@v1 with: command: cd admin && bin/rails test -b @@ -42,6 +56,9 @@ jobs: with: ruby-version: 3.2 bundler-cache: true + + - name: Ensure docker-compose is installed + run: sudo apt-get update && sudo apt-get install -y docker-compose - uses: workarea-commerce/ci/test@v1 with: command: cd admin && bin/rails teaspoon @@ -54,6 +71,9 @@ jobs: with: ruby-version: 3.2 bundler-cache: true + + - name: Ensure docker-compose is installed + run: sudo apt-get update && sudo apt-get install -y docker-compose - uses: workarea-commerce/ci/test@v1 with: command: cd admin && bin/rails test test/system/**/*_test.rb -b @@ -71,6 +91,9 @@ jobs: with: ruby-version: 3.2 bundler-cache: true + + - name: Ensure docker-compose is installed + run: sudo apt-get update && sudo apt-get install -y docker-compose - uses: workarea-commerce/ci/test@v1 with: command: cd core && bin/rails teaspoon @@ -83,6 +106,9 @@ jobs: with: ruby-version: 3.2 bundler-cache: true + + - name: Ensure docker-compose is installed + run: sudo apt-get update && sudo apt-get install -y docker-compose - uses: workarea-commerce/ci/test@v1 with: command: cd core && bin/rails test test/**/*_test.rb -b @@ -95,6 +121,9 @@ jobs: with: ruby-version: 3.2 bundler-cache: true + + - name: Ensure docker-compose is installed + run: sudo apt-get update && sudo apt-get install -y docker-compose - uses: workarea-commerce/ci/test@v1 with: command: cd storefront && bin/rails test -b @@ -107,6 +136,9 @@ jobs: with: ruby-version: 3.2 bundler-cache: true + + - name: Ensure docker-compose is installed + run: sudo apt-get update && sudo apt-get install -y docker-compose - uses: workarea-commerce/ci/test@v1 with: command: cd storefront && bin/rails teaspoon @@ -119,6 +151,9 @@ jobs: with: ruby-version: 3.2 bundler-cache: true + + - name: Ensure docker-compose is installed + run: sudo apt-get update && sudo apt-get install -y docker-compose - uses: workarea-commerce/ci/test@v1 with: command: cd storefront && bin/rails test test/system/**/*_test.rb -b