diff options
| author |  Matteo Bertucci <[email protected]> | 2021-03-17 15:36:33 +0100 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2021-03-17 15:36:33 +0100 |
| commit | d498cc6ecd3faeef9cbae6d329e9ad048db205fd (patch) | |
| tree | db949f921e4da10236517ccddf0bf53b2779bf41 /.github | |
| parent | Merge branch 'master' into swfarnsworth/infraction_message (diff) | |
| parent | Merge pull request #1467 from python-discord/bug/info/bot-xr/code-block-null-... (diff) | |
Merge branch 'main' into swfarnsworth/infraction_message
Diffstat (limited to '.github')
| -rw-r--r-- | .github/FUNDING.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/deploy.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/lint-test.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/sentry_release.yml | 4 |
5 files changed, 6 insertions, 7 deletions
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 6d9919ef2..000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -patreon: python_discord -custom: https://www.redbubble.com/people/pythondiscord diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c97e8784..e6826e09b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: workflow_run: workflows: ["Lint & Test"] branches: - - master + - main types: - completed diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5a4aede30..8b809b777 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,12 +4,13 @@ on: workflow_run: workflows: ["Build"] branches: - - master + - main types: - completed jobs: build: + environment: production if: github.event.workflow_run.conclusion == 'success' name: Build & Push runs-on: ubuntu-latest diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index 6fa8e8333..95bed2e14 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -3,7 +3,7 @@ name: Lint & Test on: push: branches: - - master + - main pull_request: diff --git a/.github/workflows/sentry_release.yml b/.github/workflows/sentry_release.yml index b8d92e90a..f6a1e1f0e 100644 --- a/.github/workflows/sentry_release.yml +++ b/.github/workflows/sentry_release.yml @@ -3,14 +3,14 @@ name: Create Sentry release on: push: branches: - - master + - main jobs: create_sentry_release: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@master + uses: actions/checkout@main - name: Create a Sentry.io release uses: tclindner/[email protected] |