Merge pull request #37 from testground/master-upgrade

upgrade (#9)
testground · Sep 5, 2022 · 09fe550 · 09fe550
2 parents 0988de2 + f296ec5
commit 09fe550
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -90,7 +90,7 @@ jobs:
           git_branch="${GITHUB_REF_NAME}-sync-${TF_WORKSPACE}"
           git checkout -B "${git_branch}"
           git add --all
-          git diff-index --quiet HEAD || git commit --message="chore: sync ${TF_WORKSPACE} (#${GITHUB_RUN_NUMBER})'
+          git diff-index --quiet HEAD || git commit --message="chore: sync ${TF_WORKSPACE} (#${GITHUB_RUN_NUMBER})"
           git push origin "${git_branch}" --force
   pull_request:
     needs: [prepare, sync]

diff --git a/github/testground.yml b/github/testground.yml
@@ -23,6 +23,7 @@ members:
     - mxinden
 repositories:
   docs:
+    default_branch: master
     description: Content for docs.testground.ai
     teams:
       admin:
@@ -34,6 +35,7 @@ repositories:
   github-mgmt:
     branch_protection:
       master: {}
+    default_branch: master
     files:
       CODEOWNERS:
         content: >
@@ -46,6 +48,7 @@ repositories:
     collaborators:
       push:
         - Stebalien
+    default_branch: master
     description: Testground infrastructure - playbooks and scripts for setting up a
       Kubernetes cluster for Testground
     teams:
@@ -64,21 +67,30 @@ repositories:
     collaborators:
       admin:
         - brdji
+    default_branch: master
     description: An example project intended to help newcomers familiarize
       themselves with the Testground tool
     visibility: public
   learning-example-tg:
+    branch_protection:
+      master: {}
     collaborators:
       admin:
         - brdji
+      push:
+        - StefanGajic
+        - bokimilinkovic
+    default_branch: master
     description: Testground project with test plans and examples for the learning project
     visibility: public
   pl-infra-testground:
+    default_branch: master
     visibility: private
   plan-templates:
     collaborators:
       admin:
         - coryschwartz
+    default_branch: master
     teams:
       admin:
         - admins
@@ -87,6 +99,7 @@ repositories:
         - maintainers
     visibility: public
   pm:
+    default_branch: master
     description: Project management of Testground
     teams:
       admin:
@@ -99,6 +112,7 @@ repositories:
     collaborators:
       push:
         - Stebalien
+    default_branch: master
     description: "Testground: SDK for developing test plans in Go"
     teams:
       admin:
@@ -111,6 +125,7 @@ repositories:
     collaborators:
       admin:
         - hacdias
+    default_branch: master
     teams:
       admin:
         - admins
@@ -119,6 +134,7 @@ repositories:
         - maintainers
     visibility: public
   sdk-rust:
+    default_branch: master
     teams:
       admin:
         - admins
@@ -132,6 +148,7 @@ repositories:
         - hacdias
       pull:
         - testgroundbot
+    default_branch: master
     teams:
       admin:
         - admins
@@ -159,6 +176,7 @@ repositories:
         - lanzafame
         - petar
         - vyzo
+    default_branch: master
     description: 🧪 A platform for testing, benchmarking, and simulating distributed
       and p2p systems at scale.
     teams:
@@ -174,6 +192,7 @@ repositories:
       - testing
     visibility: public
   testground-github-action:
+    default_branch: master
     visibility: public
 teams:
   admins:

diff --git a/scripts/src/actions/update-pull-requests.ts b/scripts/src/actions/update-pull-requests.ts
@@ -31,10 +31,15 @@ async function updatePullRequests() {
       continue
     }
 
-    github.client.pulls.updateBranch({
-      ...context.repo,
-      pull_number: pull.number
-    })
+    try {
+      await github.client.pulls.updateBranch({
+        ...context.repo,
+        pull_number: pull.number
+      })
+    } catch (error) {
+      // we might be unable to update the pull request if it there is a conflict
+      console.error(error)
+    }
   }
 }