From 6278e621e66537632478bffd42c8b0e727a2cdf9 Mon Sep 17 00:00:00 2001
From: Andrzej Chmielewski <andrzejchm@users.noreply.github.com>
Date: Thu, 27 Jan 2022 09:38:45 +0100
Subject: [PATCH] fix deployment scripts (#201)

---
 .github/workflows/deploy-firebase-android.yml | 7 +------
 .github/workflows/deploy-firebase-ios.yml     | 6 +-----
 starport_template/ios/fastlane/Fastfile       | 9 +++++----
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/deploy-firebase-android.yml b/.github/workflows/deploy-firebase-android.yml
index 1f5dc020..e2eced33 100644
--- a/.github/workflows/deploy-firebase-android.yml
+++ b/.github/workflows/deploy-firebase-android.yml
@@ -53,11 +53,6 @@ jobs:
         with:
           fetch-depth: 10
 
-      - name: check for changes in folders
-        run: >
-          echo "template-changes=$(git diff --quiet HEAD HEAD~1  --
-          starport_template && echo "false" || echo "true")" >> $GITHUB_ENV
-
       - uses: subosito/flutter-action@v1
         with:
           flutter-version: '${{ env.FLUTTER_VERSION }}'
@@ -67,7 +62,7 @@ jobs:
         run: flutter pub get
 
       - name: set up ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
 
diff --git a/.github/workflows/deploy-firebase-ios.yml b/.github/workflows/deploy-firebase-ios.yml
index 46483a9f..acfb1092 100644
--- a/.github/workflows/deploy-firebase-ios.yml
+++ b/.github/workflows/deploy-firebase-ios.yml
@@ -58,10 +58,6 @@ jobs:
         with:
           fetch-depth: 10
 
-      - name: check for changes in folders
-        run: |
-          echo "changes_starport_template=$(git diff --quiet HEAD HEAD~1  -- starport_template && echo "false" || echo "true")" >> $GITHUB_ENV
-
       - uses: subosito/flutter-action@v1
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
@@ -71,7 +67,7 @@ jobs:
         run: flutter pub get
 
       - name: set up ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ env.RUBY_VERSION }}
 
diff --git a/starport_template/ios/fastlane/Fastfile b/starport_template/ios/fastlane/Fastfile
index d69849ac..34b3fd75 100644
--- a/starport_template/ios/fastlane/Fastfile
+++ b/starport_template/ios/fastlane/Fastfile
@@ -41,10 +41,11 @@ platform :ios do
       team_id: ENV["MATCH_TEAM_ID"],
       path: "Runner.xcodeproj"
     )
-
-    increment_build_number(
-      build_number: ENV["GITHUB_RUN_NUMBER"]
-    )
+    if ENV["GITHUB_RUN_NUMBER"]
+        increment_build_number(
+          build_number: ENV["GITHUB_RUN_NUMBER"]
+        )
+    end
 
     build_app(
         workspace: "Runner.xcworkspace",