Update master branch to main.

Wycliffe-USA · May 31, 2024 · 70e640c · 70e640c
1 parent c031027
commit 70e640c
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 56 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,17 +38,17 @@ jobs:
         run: bundle install
 
       - name: Import App Store Connect API Key
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         env:
           APP_STORE_CONNECT_API_JSON_PAYLOAD: ${{ secrets.APP_STORE_CONNECT_API_JSON_PAYLOAD }}
         run: echo $APP_STORE_CONNECT_API_JSON_PAYLOAD > fastlane/AppleAppStoreApi.json
 
       - name: Increment Xcode Project Build Number
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         run: bundle exec fastlane cru_shared_lane_increment_xcode_project_build_number
 
       - name: Build And Deploy For TestFlight Release
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         env:
           MATCH_GIT_BASIC_AUTHORIZATION_PAT: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION_PAT }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -1,55 +1,55 @@
-name: Build App
-
-on:
-  push:
-    branches: [ develop, master ]
-  pull_request:
-    branches: [ develop, master ]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: macos-14
-    env:
-      FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 60
+# name: Build App
+
+# on:
+#   push:
+#     branches: [ develop, master ]
+#   pull_request:
+#     branches: [ develop, master ]
+
+#   # Allows you to run this workflow manually from the Actions tab
+#   workflow_dispatch:
+
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: true
+
+# jobs:
+#   build:
+#     runs-on: macos-14
+#     env:
+#       FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 60
 
-    steps:
+#     steps:
 
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Select Xcode Version
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: '15.2.0'
-
-      - name: MPDXiOSLib SSH Key
-        uses: webfactory/[email protected]
-        with:
-          ssh-private-key: ${{ secrets.MPDX_IOS_LIB_SSH_PRIVATE_KEY }}
-
-      - name: Bundle Install
-        run: bundle install
-
-      - name: Import App Store Connect API Key
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-        env:
-          APP_STORE_CONNECT_API_JSON_PAYLOAD: ${{ secrets.APP_STORE_CONNECT_API_JSON_PAYLOAD }}
-        run: echo $APP_STORE_CONNECT_API_JSON_PAYLOAD > fastlane/AppleAppStoreApi.json
-
-      - name: Increment Xcode Project Build Number
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-        run: bundle exec fastlane cru_shared_lane_increment_xcode_project_build_number
-
-      - name: Build And Deploy For TestFlight Release
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-        env:
-          MATCH_GIT_BASIC_AUTHORIZATION_PAT: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION_PAT }}
-          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-        run: bundle exec fastlane cru_shared_lane_build_and_deploy_for_testflight_release is_running_in_ci:true
+#       - name: Checkout code
+#         uses: actions/checkout@v4
+
+#       - name: Select Xcode Version
+#         uses: maxim-lobanov/setup-xcode@v1
+#         with:
+#           xcode-version: '15.2.0'
+
+#       - name: MPDXiOSLib SSH Key
+#         uses: webfactory/[email protected]
+#         with:
+#           ssh-private-key: ${{ secrets.MPDX_IOS_LIB_SSH_PRIVATE_KEY }}
+
+#       - name: Bundle Install
+#         run: bundle install
+
+#       - name: Import App Store Connect API Key
+#         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+#         env:
+#           APP_STORE_CONNECT_API_JSON_PAYLOAD: ${{ secrets.APP_STORE_CONNECT_API_JSON_PAYLOAD }}
+#         run: echo $APP_STORE_CONNECT_API_JSON_PAYLOAD > fastlane/AppleAppStoreApi.json
+
+#       - name: Increment Xcode Project Build Number
+#         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+#         run: bundle exec fastlane cru_shared_lane_increment_xcode_project_build_number
+
+#       - name: Build And Deploy For TestFlight Release
+#         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+#         env:
+#           MATCH_GIT_BASIC_AUTHORIZATION_PAT: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION_PAT }}
+#           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+#         run: bundle exec fastlane cru_shared_lane_build_and_deploy_for_testflight_release is_running_in_ci:true