Merge upstream develop

Author: github-actions[bot]

.gitignore

@@ -41,4 +41,6 @@ services/server/data
 
 # Generated files
 docker-compose.live*
+
+# Secrets
 .env

.gitlab/ci/build_app.yml

@@ -5,12 +5,14 @@
       when: always
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
+        - packages/**/*
         - apps/**/*
         - .gitlab/ci/build_app.yml
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
+        - packages/**/*
         - apps/**/*
         - .gitlab/ci/build_app.yml
 

.gitlab/ci/build_js_sdks.yml

@@ -5,13 +5,15 @@
       when: always
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-        - packages/js-*/**/*
+        - packages/**/*
+        - apps/**/*
         - .gitlab/ci/build_js_sdks.yml
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - packages/js-*/**/*
+        - packages/**/*
+        - apps/**/*
         - .gitlab/ci/build_js_sdks.yml
 
 .js-sdks-base:
@@ -39,10 +41,6 @@ js-sdks-build:
     paths:
       - packages/js-*/dist
     expire_in: 1 week
-  rules:
-    - !reference [.js-sdk-workflow, rules]
-    - !reference [.rn-sdk-workflow, rules]
-    - !reference [.app-workflow, rules]
 
 .js-sdks-publish-npm:
   rules:

.gitlab/ci/build_rn_sdk.yml

@@ -5,14 +5,16 @@
       when: always
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-        - packages/react-native/**/*
-        - .gitlab/ci/build_rn_sdks.yml
+        - packages/**/*
+        - apps/**/*
+        - .gitlab/ci/build_rn_sdk.yml
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - packages/react-native/**/*
-        - .gitlab/ci/build_rn_sdks.yml
+        - packages/**/*
+        - apps/**/*
+        - .gitlab/ci/build_rn_sdk.yml
 
 .rn-sdk-base:
   extends: .rn-sdk-workflow
@@ -58,6 +60,3 @@ rn-sdk-build:
       - packages/react-native/android/libs
       - packages/react-native/ios/libs
     expire_in: 1 week
-  rules:
-    - !reference [.rs-sdk-workflow, rules]
-    - !reference [.app-workflow, rules]

.gitlab/ci/build_rs_core.yml

@@ -5,15 +5,15 @@
       when: always
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-        - packages/rs-core/**/*
-        - packages/rs-common/**/*A
+        - packages/**/*
+        - apps/**/*
         - .gitlab/ci/build_rs_core.yml
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - packages/rs-core/**/*
-        - packages/rs-common/**/*
+        - packages/**/*
+        - apps/**/*
         - .gitlab/ci/build_rs_core.yml
   variables:
     RUNNER_SCRIPT_TIMEOUT: 179m
@@ -98,9 +98,6 @@ build-android-image:
   extends: .rs-sdk-workflow
   image: ${ANDROID_IMAGE}
   stage: build
-  rules:
-    - !reference [.rs-sdk-workflow, rules]
-    - !reference [.app-workflow, rules]
 
 rs-sdk-format-check:
   extends: .rust-check
@@ -114,10 +111,6 @@ rs-sdk-clippy:
 
 rs-sdk-build-wasm-browser:
   extends: .rs-sdk-build-wasm
-  rules:
-    - !reference [.rs-sdk-workflow, rules]
-    - !reference [.js-sdk-workflow, rules]
-    - !reference [.app-workflow, rules]
   script:
     - just build-wasm-web
   artifacts:

apps/polycentric/.gitignore

@@ -68,10 +68,12 @@ DerivedData
 *.xcuserstate
 project.xcworkspace
 Pods/
+ios/
 
 
 # Android
 *.iml
 .idea
 .gradle
 local.properties
+android/