fix: split tests and approval

tianhaoz95 · Nov 5, 2021 · e1f4f4c · e1f4f4c
1 parent 30dd7cf
commit e1f4f4c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -36,5 +36,5 @@
   ],
   "postCreateCommand": "ruby --version",
   "remoteUser": "vscode",
-  "postStartCommand": "bundle install && npm install && git config --global user.email \"${localEnv:VSCODE_CONTAINER_GIT_EMAIL}\" && git config --global user.name \"${localEnv:VSCODE_CONTAINER_GIT_USER}\""
+  "postStartCommand": "bundle install && npm ci"
 }
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
@@ -0,0 +1,12 @@
+name: Auto Approve
+on:
+  pull_request_target:
+    types: [opened, reopened, synchronize, labeled]
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: hmarr/auto-approve-action@v2.1.0
+        if: github.actor == 'dependabot[bot]' || github.actor == 'allcontributors[bot]'
+        with:
+          github-token: "${{ secrets.USE_GITHUB_TOKEN }}"
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -1,13 +1,12 @@
-name: Pull Request Checks
+name: Run Tests
 on:
-  pull_request_target:
-    types: [opened, reopened, synchronize, labeled]
+  pull_request:
+  push:
+    branches:
+      - master
 jobs:
   spec-test:
     runs-on: ubuntu-latest
-    if: |
-      github.actor == 'dependabot[bot]' || 
-        contains(github.event.pull_request.labels.*.name, 'safe to test')
     steps:
       - name: checkout code
         uses: actions/checkout@v2.3.4
@@ -17,18 +16,13 @@ jobs:
           ruby-version: "2.7"
           bundler-cache: true
       - name: run unit tests
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: bundle exec rake
       - name: run e2e tests
         run: |
           bundle exec fastlane test
           bundle exec fastlane test_no_version_code
   regression-test:
     runs-on: ubuntu-latest
-    if: |
-      github.actor == 'dependabot[bot]' || 
-        contains(github.event.pull_request.labels.*.name, 'safe to test')
     steps:
       - uses: actions/checkout@v2.3.4
       - uses: ruby/setup-ruby@v1
@@ -49,15 +43,3 @@ jobs:
           cp ../../regression/Gemfile .
           bundle install
           bundle exec fastlane regression
-  auto-approve:
-    runs-on: ubuntu-latest
-    needs: [spec-test, regression-test]
-    steps:
-      - uses: hmarr/auto-approve-action@v2.1.0
-        if: github.actor == 'dependabot[bot]'
-        with:
-          github-token: "${{ secrets.USE_GITHUB_TOKEN }}"
-      - uses: hmarr/auto-approve-action@v2.1.0
-        if: github.actor == 'allcontributors[bot]'
-        with:
-          github-token: "${{ secrets.USE_GITHUB_TOKEN }}"