Always use package.json mixin

jhugman · Nov 15, 2024 · 88fb39c · 88fb39c
1 parent 0b08caa
commit 88fb39c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/.github/workflows/compat.yml b/.github/workflows/compat.yml
@@ -23,12 +23,9 @@ jobs:
         rn-version:
           - 0.76.0
           - 0.76.1
-        package-json-mixin:
-          - none
-          - package.codegen-output-dir.json
 
     runs-on: ${{ matrix.runner }}
-    name: "bob ${{ matrix.bob-version }} / rn ${{ matrix.rn-version }} / ${{ matrix.package-json-mixin }} / ${{ matrix.runner == 'macos-latest' && 'ios' || 'android' }}"
+    name: "bob ${{ matrix.bob-version }} / rn ${{ matrix.rn-version }} / ${{ matrix.runner == 'macos-latest' && 'ios' || 'android' }}"
 
     steps:
       - uses: actions/checkout@v4
@@ -56,6 +53,6 @@ jobs:
             --ubrn-config integration/fixtures/compat/ubrn.config.yaml \
             --builder-bob-version ${{ matrix.bob-version }} \
             --rn-version ${{ matrix.rn-version }} \
-            --packgage-json-mixin integration/fixtures/compat/${{ matrix.package-json-mixin }} \
+            --packgage-json-mixin integration/fixtures/compat/package.json \
             --${{ matrix.runner == 'macos-latest' && 'ios' || 'android' }} \
             ../turbo-module
diff --git a/integration/fixtures/compat/package.codegen-output-dir.json b/integration/fixtures/compat/package.codegen-output-dir.json
diff --git a/integration/fixtures/compat/package.json b/integration/fixtures/compat/package.json
@@ -0,0 +1,8 @@
+{
+  "codegenConfig": {
+    "outputDir": {
+      "ios": "ios/tmp",
+      "android": "android/tmp"
+    }
+  }
+}