Merge remote-tracking branch 'origin/master' into setSeconds-bug

henninghall · Feb 26, 2024 · 09c8a26 · 09c8a26
2 parents 2cb6aca + 1b05df8
commit 09c8a26
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -16,17 +16,17 @@ jobs:
     outputs:
       app: app/build/outputs/apk/release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          ref: ${{ github.ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: cache-android
         with:
           path: ${{ env.APP_PATH }}
           key: ${{ runner.os }}-${{ hashFiles('src/**', 'android/**', env.EXAMPLE_SRC, env.APP_PATH ) }}
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         if: steps.cache-android.outputs.cache-hit != 'true'
         with:
           node-version: 14.18.1
@@ -42,7 +42,7 @@ jobs:
         working-directory: ./
         run: yarn install --frozen-lockfile
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         if: steps.cache-android.outputs.cache-hit != 'true'
         with:
           java-version: 11

diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
@@ -15,19 +15,19 @@ jobs:
     runs-on: macos-13
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          ref: ${{ github.ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: cache
         with:
           path: |
             ${{ env.APP_PATH }}
             ${{ env.APP_PATH }}.dSYM
           key: ${{ runner.os }}-${{ hashFiles('src/**', 'ios/**', env.EXAMPLE_SRC, env.APP_PATH ) }}
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         if: steps.cache.outputs.cache-hit != 'true'
         with:
           node-version: 14.18.1

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 12
           registry-url: https://registry.npmjs.org/

diff --git a/.github/workflows/test-android-e2e.yml b/.github/workflows/test-android-e2e.yml
@@ -25,11 +25,11 @@ jobs:
     environment: e2e Android
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          ref: ${{ github.ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: cache-android
         with:
           path: ${{ env.APP_PATH }}

diff --git a/.github/workflows/test-android-unit.yml b/.github/workflows/test-android-unit.yml
@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          ref: ${{ github.ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: 'temurin'

diff --git a/.github/workflows/test-ios-e2e.yml b/.github/workflows/test-ios-e2e.yml
@@ -15,11 +15,11 @@ jobs:
     environment: e2e iOS
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          ref: ${{ github.ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: cache
         with:
           path: |
@@ -54,3 +54,5 @@ jobs:
           fi
         env:
           MAESTRO_CLOUD_FLOW_RESULTS: ${{ steps.upload.outputs.MAESTRO_CLOUD_FLOW_RESULTS }}
+
+          #temp
diff --git a/.github/workflows/test-js.yml b/.github/workflows/test-js.yml
@@ -12,12 +12,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.ref }}
+        uses: actions/checkout@v4
 
       - name: Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
 
       - name: Install npm dependencies
         run: yarn install --frozen-lockfile