Merge branch 'main' into 953-component-common-remove-if-modifier

.github/workflows/buildAndTest.yml

@@ -79,6 +79,9 @@ jobs:
         do
           cd ${{ github.workspace }}
           cd "$file"
+          if [[ ${{ vars.SPM_NAME }} == "SparkCommon" ]]; then
+            sed -i '' 's|../spark-ios-common|../../../../|g' '.sourcery.yml'
+          fi
           echo "Dependencies: $file"
           sourcery
         done

.github/workflows/buildDemoApp.yml

@@ -32,8 +32,9 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Clone the demo project from a specific branch
+      env:
+        PR_COMMENT: ${{ github.event.comment.body }}
       run: |
-        PR_COMMENT="${{ github.event.comment.body }}"
         SPARK_IOS_BRANCH=${PR_COMMENT#'/buildDemo'}
         SPARK_IOS_BRANCH=${SPARK_IOS_BRANCH// /}
         if [ -z $SPARK_IOS_BRANCH ];then
@@ -85,9 +86,9 @@ jobs:
           [SparkDemo.app](${{ steps.artifact-upload-step.outputs.artifact-url }}) is available.
 
           Process:
-           1. Download the app
-           2. Download if needed the [SparkConfiguration](https://github.com/adevinta/spark-ios-configuration) mac os app.
-           3. Launch SparkConfiguration, on the testing entry on the sidebar, select the simulator you want and add the SparkDemo.app file.
+           1. Download the app with the link above.
+           2. Download if needed the [Sparkans](https://github.com/adevinta/spark-ios-configuration/releases/latest) mac os app.
+           3. Launch Sparkans, on the **Simulators** entry on the sidebar, select the simulator you want and add the SparkDemo.app file.
            4. Envoy ;)
       with:
         script: |

.sourcery.yml

@@ -6,7 +6,7 @@ configurations:
         - Sources/Testing/
         - Sources/SnapshotTesting/
     templates:
-      - ../spark-ios-common/.sourcery/template/
+      - .sourcery/template
     output: Sources/Testing/Generated/Sourcery.generated.swift
     args:
       autoMockableImports: [Combine, SparkTheming]