diff --git a/.github/workflows/backmerge.yml b/.github/workflows/backmerge.yml new file mode 100644 index 0000000..b724f95 --- /dev/null +++ b/.github/workflows/backmerge.yml @@ -0,0 +1,35 @@ +name: Backmerge master to staging + +on: + push: + branches: [ master ] + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +jobs: + backmerge: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Check for Pull Request + id: check + run: | + PR_LIST=$(gh pr list --base="staging" --head="master" --state="open" --json="number") + echo $PR_LIST + echo "::set-output name=pr_list::$PR_LIST" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Create Pull Request + run: | + if [ $PR_LIST = "[]" ] + then + gh pr create --title="Backmerge master to staging" --body="" --base="staging" --head="master" + else + echo "Open PR already exists" + fi + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_LIST: ${{ steps.check.outputs.pr_list }} diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..d28bb3a --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,6 @@ +/README.md @samatcolumn + +/foo/ @hatboysam +/foo/baz/ @hatboysam-test + +/bar/ @hatboysam-test diff --git a/README.md b/README.md index a48d4db..db35a87 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# testbed \ No newline at end of file +# testbed - apple + +Update the README. Again. \ No newline at end of file diff --git a/bar/file.txt b/bar/file.txt new file mode 100644 index 0000000..52f2ed3 --- /dev/null +++ b/bar/file.txt @@ -0,0 +1 @@ +bar/file.txt \ No newline at end of file diff --git a/foo/baz/file.txt b/foo/baz/file.txt new file mode 100644 index 0000000..f29d9bb --- /dev/null +++ b/foo/baz/file.txt @@ -0,0 +1 @@ +foo/baz/file.txt \ No newline at end of file diff --git a/foo/file.txt b/foo/file.txt new file mode 100644 index 0000000..3f82f90 --- /dev/null +++ b/foo/file.txt @@ -0,0 +1 @@ +foo/file.txt \ No newline at end of file