Merge branch 'dev' into chore/cleanup-deps

Satellite-im · Mar 22, 2024 · c9fe4ce · c9fe4ce
2 parents 83d304a + 7931737
commit c9fe4ce
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/.github/workflows/ui-test-automation.yml b/.github/workflows/ui-test-automation.yml
@@ -208,6 +208,12 @@ jobs:
           ref: b574da4ab10cfd7bf38ec0e2b499232a2e8f8eff
           path: "./warp"
 
+      - name: Install Dependencies for WebdriverIO
+        continue-on-error: true
+        run: |
+          brew update
+          brew install cairo pango
+
       - name: Download Key file 🗳️
         uses: actions/download-artifact@v3
         with:
@@ -224,7 +230,7 @@ jobs:
       - name: Setup Node.js 🔨
         uses: actions/setup-node@v3
         with:
-          node-version: 18.17.1
+          node-version: 20
           cache: "npm"
 
       - name: Cache NPM dependencies 🔨
@@ -251,8 +257,12 @@ jobs:
         working-directory: ./apps
         run: |
           unzip Uplink-Mac-Universal.zip
+          cp -r ./Uplink.app ./Uplink2.app
+          perl -i -pe 's/im.satellite.uplink/im.satellite.uplinkChatUserB/g' ./Uplink2.app/Contents/Info.plist
           cp -r ./Uplink.app /Applications/
+          cp -r ./Uplink2.app /Applications/
           sudo xattr -r -d com.apple.quarantine /Applications/Uplink.app
+          sudo xattr -r -d com.apple.quarantine /Applications/Uplink2.app
 
       - name: Install Appium Server 💻
         run: |
@@ -341,6 +351,12 @@ jobs:
           ref: b574da4ab10cfd7bf38ec0e2b499232a2e8f8eff
           path: "./warp"
 
+      - name: Install Dependencies for WebdriverIO
+        continue-on-error: true
+        run: |
+          brew update
+          brew install cairo pango
+
       - name: Download Key file 🗳️
         uses: actions/download-artifact@v3
         with:
@@ -357,7 +373,7 @@ jobs:
       - name: Setup Node.js 🔨
         uses: actions/setup-node@v3
         with:
-          node-version: 18.17.1
+          node-version: 20
           cache: "npm"
 
       - name: Cache NPM dependencies 🔨
@@ -506,7 +522,7 @@ jobs:
       - name: Setup Node.js 🔨
         uses: actions/setup-node@v3
         with:
-          node-version: 18.17.1
+          node-version: 20
           cache: "npm"
 
       - name: Cache NPM dependencies 🔨

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,7 @@ opt-level = 3
 codegen-units = 1
 
 [workspace.package]
-version = "0.2.5"
+version = "1.0.0"
 rust-version = "1.75"
 
 [workspace.dependencies]