diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml deleted file mode 100644 index bbd2a7b..0000000 --- a/.github/workflows/auto-merge.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: auto-merge -on: pull_request_target - -jobs: - dependabot: - runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} - steps: - - uses: fastify/github-action-merge-dependabot@v2.1.1 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..1712f80 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,33 @@ +name: ci + +on: + push: + branches: [ main ] + pull_request_target: + branches: [ main ] + +jobs: + test-ubuntu: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + submodules: 'recursive' + - name: Install dotfiles + run: ./install + test-windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + with: + submodules: 'recursive' + - name: Install dotfiles + run: .\install-windows.ps1 + dependabot-auto-merge: + needs: [test-ubuntu, test-windows] + runs-on: ubuntu-latest + if: ${{ github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]' }} + steps: + - uses: fastify/github-action-merge-dependabot@v2.1.1 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml deleted file mode 100644 index c076860..0000000 --- a/.github/workflows/tests.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: tests - -on: [push] - -jobs: - ubuntu: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - submodules: 'recursive' - - name: Install dotfiles - run: ./install - windows: - runs-on: windows-latest - steps: - - uses: actions/checkout@v2 - with: - submodules: 'recursive' - - name: Install dotfiles - run: .\install-windows.ps1