From 01fcf85de5bc55c2439edbcd766ce078df202187 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Mon, 25 Oct 2021 19:15:39 -0400 Subject: [PATCH 1/8] git ignore .DS_Store mac things Signed-off-by: Joseph Mattello --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 08b7ff2c..090e07af 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ *.exe *.js *.bc +.DS_Store From 39de41558577c1cbabfd6002445b119b1833889d Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Mon, 25 Oct 2021 19:16:26 -0400 Subject: [PATCH 2/8] Add CODEOWNERS Signed-off-by: Joseph Mattello --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..121e7837 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @JoeMatt @twinaphex From 11242726e0c1a369164a93fb594c944eea7dda26 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Mon, 25 Oct 2021 19:16:50 -0400 Subject: [PATCH 3/8] Add rebase.yml rebase action Signed-off-by: Joseph Mattello --- .github/workflows/rebase.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/rebase.yml diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml new file mode 100644 index 00000000..f13dc615 --- /dev/null +++ b/.github/workflows/rebase.yml @@ -0,0 +1,20 @@ +# https://github.com/marketplace/actions/automatic-rebase +name: Automatic Rebase +on: + issue_comment: + types: [created] +jobs: + rebase: + name: Rebase + if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') + runs-on: ubuntu-latest + steps: + - name: Checkout the latest code + uses: actions/checkout@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + fetch-depth: 0 # otherwise, you will fail to push refs to dest repo + - name: Automatic Rebase + uses: cirrus-actions/rebase@1.4 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 4b76b0fc1c97b53aa138e53ae8451df4fdba205d Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Mon, 25 Oct 2021 19:17:04 -0400 Subject: [PATCH 4/8] Add build.yml ci action Signed-off-by: Joseph Mattello --- .github/workflows/build.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..0e62c963 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,16 @@ +name: Build + +on: + push: + branches: [master] + pull_request: + branches: [master] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: checkout repo + uses: actions/checkout@v2 + - name: build application + run: make From 69c9cd6bae7f330f614c2420469eca31cac71dd9 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Mon, 25 Oct 2021 19:17:24 -0400 Subject: [PATCH 5/8] gitignore .build Signed-off-by: Joseph Mattello --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 090e07af..510f8f34 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ *.js *.bc .DS_Store +.build From a7d74867d076d61e53d21499220d2f427069d3c5 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Wed, 27 Oct 2021 23:27:13 -0400 Subject: [PATCH 6/8] github action build add matrix --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e62c963..a77d71e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,11 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [macos-latest, windows-latest, ubuntu-latest] steps: - name: checkout repo uses: actions/checkout@v2 From 25d31a474350ed826301e87150ed93de8f9202ab Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Wed, 27 Oct 2021 23:42:13 -0400 Subject: [PATCH 7/8] Build action upload and comment build artifacts Signed-off-by: Joseph Mattello --- .github/workflows/build.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a77d71e7..b31198d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,8 @@ name: Build on: - push: - branches: [master] pull_request: - branches: [master] + types: [opened, edited, ready_for_review, reopened] jobs: build: @@ -16,5 +14,25 @@ jobs: steps: - name: checkout repo uses: actions/checkout@v2 + - name: build application run: make + + - name: upload artifacts + - uses: actions/upload-artifact@v2 + with: + name: results + path: virtualjaguar_libretro.* + if-no-files-found: error + + - name: download artifacts + - uses: actions/download-artifact@v2 + with: + name: results + + # - name: comment PR + # uses: machine-learning-apps/pr-comment@master + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # path: results/results.txt \ No newline at end of file From c65e11d2b69ce4e4a45f7f9b77d69c6f958317ba Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Thu, 28 Oct 2021 00:48:00 -0400 Subject: [PATCH 8/8] GitHub action auto create PR on feature branch Signed-off-by: Joseph Mattello --- .github/workflows/pull-request.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/pull-request.yml diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml new file mode 100644 index 00000000..75fc4a6f --- /dev/null +++ b/.github/workflows/pull-request.yml @@ -0,0 +1,19 @@ +name: Pull Request on Branch Push +on: + push: + branches-ignore: + - staging + - launchpad + - production +jobs: + auto-pull-request: + name: PullRequestAction + runs-on: ubuntu-latest + steps: + - name: pull-request-action + uses: vsoch/pull-request-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BRANCH_PREFIX: 'feature/' + PULL_REQUEST_BRANCH: 'master' + PULL_REQUEST_DRAFT: true