Third attempt at updating push.yml GH Action to work

[beta] [clowntown]
the-blue-alliance · Jan 1, 2021 · fa7c13a · fa7c13a
1 parent b0a60b5
commit fa7c13a
Showing 1 changed file with 4 additions and 59 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -9,10 +9,9 @@ env:
   DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
 
 jobs:
-  test:
-    name: Test
+  test-publish:
+    name: Test + Publish
     runs-on: macos-latest
-    if: ${{ !contains(github.event.head_commit.message, '[clowntown]') }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -36,36 +35,10 @@ jobs:
         env:
           TBA_API_KEY: ${{ secrets.TBA_API_KEY }}
       - name: fastlane test
+        if: ${{ !contains(github.event.head_commit.message, '[clowntown]') }}
         run: bundle exec fastlane test
-
-  beta:
-    name: Beta
-    runs-on: macos-latest
-    if: ${{ contains(github.event.head_commit.message, '[beta]') && !contains(github.event.head_commit.message, '[app_store]') }}
-    needs: [test]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: ${{ runner.os }}-gems-
-      - uses: actions/cache@v2
-        with:
-          path: Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: ${{ runner.os }}-pods-
-      - name: Install
-        run: |
-          cp mock-Secrets.plist the-blue-alliance-ios/Secrets.plist
-          bundle install
-          bundle exec pod install --repo-update
-          bundle exec fastlane run setup_ci
-          bundle exec fastlane setup_secrets
-        env:
-          TBA_API_KEY: ${{ secrets.TBA_API_KEY }}
       - name: fastlane beta_ci
+        if: ${{ contains(github.event.head_commit.message, '[beta]') }}
         run: bundle exec fastlane beta_ci
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
@@ -74,34 +47,6 @@ jobs:
           MATCH_GIT_REPO: ${{ secrets.MATCH_GIT_REPO }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           SLACK_URL: ${{ secrets.SLACK_URL }}
-
-  app-store:
-    name: App Store
-    runs-on: macos-latest
-    if: ${{ contains(github.event.head_commit.message, '[app_store]') && !contains(github.event.head_commit.message, '[beta]') }}
-    needs: [test]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: ${{ runner.os }}-gems-
-      - uses: actions/cache@v2
-        with:
-          path: Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: ${{ runner.os }}-pods-
-      - name: Install
-        run: |
-          cp mock-Secrets.plist the-blue-alliance-ios/Secrets.plist
-          bundle install
-          bundle exec pod install --repo-update
-          bundle exec fastlane run setup_ci
-          bundle exec fastlane setup_secrets
-        env:
-          TBA_API_KEY: ${{ secrets.TBA_API_KEY }}
       - name: fastlane app_store
         if: ${{ contains(github.event.head_commit.message, '[app_store]') }}
         run: bundle exec fastlane app_store