Update workflows

This commit is contained in:
Gabriel Augendre 2023-03-14 19:51:11 +01:00
parent 4996112310
commit 38c7d5ef02
4 changed files with 36 additions and 37 deletions

View file

@ -1,14 +1,3 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL" name: "CodeQL"
on: on:
@ -83,4 +72,4 @@ jobs:
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2 uses: github/codeql-action/analyze@v2
with: with:
category: {% raw %}"/language:${{matrix.language}}"{% endraw %} category: "/language:${{matrix.language}}"

View file

@ -1,4 +1,4 @@
name: Build, publish & deploy name: Test, build, publish & deploy
on: on:
workflow_dispatch: workflow_dispatch:
@ -25,7 +25,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}{% endraw %} password: ${{ secrets.DOCKERHUB_TOKEN }}{% endraw %}
- name: Build and push Docker image - name: Build and push Docker image
uses: docker/build-push-action@v3 uses: docker/build-push-action@v4
with: with:
context: . context: .
push: true push: true

View file

@ -0,0 +1,33 @@
name: Test & auto merge
on:
pull_request:
branches: [ "master" ]
permissions:
contents: read
jobs:
tests:
uses: ./.github/workflows/test.yaml
auto_merge:
name: Auto merge
runs-on: ubuntu-latest
needs: tests
permissions:
pull-requests: write
contents: write
env:
GH_TOKEN: {% raw %}${{ github.token }}{% endraw %}
if: >-
github.event.pull_request
&& github.event.pull_request.merged == false
&& (
github.event.pull_request.user.login == 'crocmagnon-pr[bot]'
|| github.event.pull_request.user.login == 'pre-commit-ci[bot]'
)
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Auto merge
run: gh pr merge {% raw %}${{github.event.pull_request.number}}{% endraw %} --delete-branch --rebase

View file

@ -3,8 +3,6 @@ name: Test
on: on:
workflow_dispatch: workflow_dispatch:
workflow_call: workflow_call:
pull_request:
branches: [ "master" ]
permissions: permissions:
contents: read contents: read
@ -35,24 +33,3 @@ jobs:
- name: Test - name: Test
run: pytest --cov=. --cov-branch --cov-report term-missing:skip-covered run: pytest --cov=. --cov-branch --cov-report term-missing:skip-covered
working-directory: ./src/ working-directory: ./src/
auto_merge:
name: Auto merge
runs-on: ubuntu-latest
needs: tests
permissions:
pull-requests: write
contents: write
env:
GH_TOKEN: {% raw %}${{ github.token }}{% endraw %}
if: >-
github.event.pull_request
&& github.event.pull_request.merged == false
&& (
github.event.pull_request.user.login == 'crocmagnon-pr[bot]'
|| github.event.pull_request.user.login == 'pre-commit-ci[bot]'
)
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Auto merge
run: gh pr merge {% raw %}${{github.event.pull_request.number}}{% endraw %} --delete-branch --rebase