Merge pull request #171 from OpenLiberty/staging

Merge prod to staging - Update test.yml and triggerConversion.yml (#170)
OpenLiberty · May 19, 2021 · fad440c · fad440c
2 parents 5690d43 + 0b5d63a
commit fad440c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,7 +2,7 @@ name: Test application
 
 on:
   pull_request:
-    branches: [master, qa]
+    branches: [ prod, staging ]
 
 jobs:
   check-files:
@@ -28,6 +28,7 @@ jobs:
           VALIDATE_ALL_CODEBASE: false
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           LINTER_RULES_PATH: ./tools/pr-checker/linters/
+          DEFAULT_BRANCH: prod
       - name: Summary
         if: always()
         run: |

diff --git a/.github/workflows/triggerConversion.yml b/.github/workflows/triggerConversion.yml
@@ -5,10 +5,7 @@ name: Rebuild cloud-hosted guide
 on:
   push:
     branches:
-      - 'master'
-      - 'main'
       - 'prod'
-      - 'qa'
       - 'staging'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
@@ -31,4 +28,4 @@ jobs:
         repo: OpenLiberty/cloud-hosted-guides
         token: ${{ secrets.GUIDECONVERSIONTOOL_PASSWORD }}
         inputs: '{ "branch": "${{ github.ref }}", "guide_name": "${{ github.event.repository.name }}" }'
-        ref: "refs/heads/prod"
+        ref: "refs/heads/prod"