Use new tool version in Github integration tests action (#501)

Shopify · Dec 16, 2024 · 4670c6f · 4670c6f
2 parents f000935 + 31d0c5b
commit 4670c6f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 16 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -22,7 +22,15 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
+        working-directory: ${{ matrix.test == 'test_integration' && 'dev' || '.' }}
     - uses: cue-lang/[email protected]
       with:
         version: 'v0.7.0'
-    - run: VERBOSE=1 make --file=Makefile ${{ matrix.test }}
+    - name: Run tests
+      working-directory: ${{ matrix.test == 'test_integration' && 'dev' || '.' }}
+      run: |
+        if [ "${{ matrix.test }}" = "test_integration" ]; then
+          bundle exec rake integration
+        else
+          VERBOSE=1 make --file=Makefile ${{ matrix.test }}
+        fi
diff --git a/dev/.ruby-version b/dev/.ruby-version
@@ -0,0 +1 @@
+3.3.0
diff --git a/dev/Gemfile b/dev/Gemfile
@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "rake"
 gem "thor", "~> 1.3"
 gem "activesupport"
 gem "activemodel"
@@ -12,5 +13,7 @@ group :development do
 end
 
 group :test do
+  gem "minitest"
+  gem "minitest-hooks"
   gem "mocha"
 end
diff --git a/dev/Gemfile.lock b/dev/Gemfile.lock
@@ -28,6 +28,8 @@ GEM
     language_server-protocol (3.17.0.3)
     logger (1.6.1)
     minitest (5.25.1)
+    minitest-hooks (1.5.2)
+      minitest (> 5.3)
     mocha (2.3.0)
       ruby2_keywords (>= 0.0.5)
     parallel (1.26.3)
@@ -36,6 +38,7 @@ GEM
       racc
     racc (1.8.1)
     rainbow (3.1.1)
+    rake (13.2.1)
     regexp_parser (2.9.2)
     rubocop (1.68.0)
       json (~> 2.3)
@@ -92,7 +95,10 @@ DEPENDENCIES
   activemodel
   activesupport
   json (~> 2.7.2)
+  minitest
+  minitest-hooks
   mocha
+  rake
   rubocop-shopify
   thor (~> 1.3)
 

diff --git a/dev/lib/product_taxonomy/commands/generate_dist_command.rb b/dev/lib/product_taxonomy/commands/generate_dist_command.rb
@@ -2,7 +2,7 @@
 
 module ProductTaxonomy
   class GenerateDistCommand < Command
-    OUTPUT_PATH = File.expand_path("../../../dist", __dir__)
+    OUTPUT_PATH = File.expand_path("../../../../dist", __dir__)
 
     def initialize(options)
       super

diff --git a/dist/en/integrations/google/shopify_2025-01_to_google_2021-09-21.json b/dist/en/integrations/google/shopify_2025-01_to_google_2021-09-21.json
@@ -168566,13 +168566,6 @@
           }
         }
       ]
-    },
-    {
-      "input_taxonomy": "shopify/2022-02",
-      "output_taxonomy": "shopify/2025-01-unstable",
-      "rules": [
-
-      ]
     }
   ]
 }
diff --git a/dist/en/integrations/shopify/shopify_2022-02_to_shopify_2025-01.json b/dist/en/integrations/shopify/shopify_2022-02_to_shopify_2025-01.json
@@ -1,13 +1,6 @@
 {
   "version": "2025-01-unstable",
   "mappings": [
-    {
-      "input_taxonomy": "shopify/2025-01-unstable",
-      "output_taxonomy": "google/2021-09-21",
-      "rules": [
-
-      ]
-    },
     {
       "input_taxonomy": "shopify/2022-02",
       "output_taxonomy": "shopify/2025-01-unstable",