Merge branch 'main' of https://github.com/GetStream/stream-chat-swiftui

Author: martinmitrevski

.github/actions/bootstrap/action.yml

@@ -3,19 +3,21 @@ description: 'Run bootstrap.sh'
 runs:
   using: "composite"
   steps:
+    - run: echo "IMAGE=${ImageOS}-${ImageVersion}" >> $GITHUB_ENV
+      shell: bash
     - name: Cache RubyGems
       uses: actions/cache@v2
       id: rubygem-cache
       with:
         path: vendor/bundle
-        key: ${{ runner.os }}-${{ env.ImageVersion }}-gem-${{ hashFiles('**/Gemfile.lock') }}
-        restore-keys: ${{ runner.os }}-${{ env.ImageVersion }}-gem-
+        key: ${{ env.IMAGE }}-gem-${{ hashFiles('**/Gemfile.lock') }}
+        restore-keys: ${{ env.IMAGE }}-gem-
     - name: Cache Mint
       uses: actions/cache@v2
       id: mint-cache
       with:
         path: ~/.mint
-        key: ${{ runner.os }}-${{ env.ImageVersion }}-mint-${{ hashFiles('**/Mintfile') }}
-        restore-keys: ${{ runner.os }}-${{ env.ImageVersion }}-mint-
+        key: ${{ env.IMAGE }}-mint-${{ hashFiles('**/Mintfile') }}
+        restore-keys: ${{ env.IMAGE }}-mint-
     - run: ./Scripts/bootstrap.sh
       shell: bash

.github/actions/set-build-image-var/action.yml

@@ -24,7 +24,6 @@ jobs:
     runs-on: macos-12
     steps:
     - uses: actions/checkout@v1
-    - uses: ./.github/actions/set-build-image-var
     - uses: ./.github/actions/bootstrap
     - name: Run Danger
       run: bundle exec danger
@@ -38,7 +37,6 @@ jobs:
     runs-on: macos-12
     steps:
     - uses: actions/checkout@v1
-    - uses: ./.github/actions/set-build-image-var
     - uses: actions/[email protected]
       with:
         python-version: 3.8
@@ -81,7 +79,6 @@ jobs:
     runs-on: macos-12
     steps:
     - uses: actions/checkout@v1
-    - uses: ./.github/actions/set-build-image-var
     - uses: ./.github/actions/bootstrap
     - name: Build Demo App
       run: bundle exec fastlane build_demo