diff options
| author |  ChrisJL <[email protected]> | 2021-05-16 18:42:50 +0100 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2021-05-16 18:42:50 +0100 |
| commit | 8c7c3b137fb6c60818d29ac3d14ebb397357ee0e (patch) | |
| tree | fec5581d5e27fc860db6424f7c1d6a3a71565693 /.github | |
| parent | Resolve conflicts (diff) | |
| parent | Merge pull request #501 from python-discord/update/sir-lancebot-env-vars (diff) | |
Merge branch 'main' into fix_327
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yaml | 6 | ||||
| -rw-r--r-- | .github/workflows/deploy.yaml | 3 | ||||
| -rw-r--r-- | .github/workflows/lint-test.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/sentry-release.yml | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d113cff7..ab7321de 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -4,7 +4,7 @@ on: workflow_run: workflows: ["Lint & Test"] branches: - - master + - main types: - completed @@ -38,8 +38,8 @@ jobs: uses: docker/login-action@v1 with: registry: ghcr.io - username: ${{ secrets.GHCR_USER }} - password: ${{ secrets.GHCR_TOKEN }} + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} # Build the container, including an inline cache manifest to # allow us to use the registry as a cache source. diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index ff2652fd..efc08040 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -4,7 +4,7 @@ on: workflow_run: workflows: ["Build"] branches: - - master + - main types: - completed @@ -13,6 +13,7 @@ jobs: if: github.event.workflow_run.conclusion == 'success' name: Deploy to Kubernetes Cluster runs-on: ubuntu-latest + environment: production steps: - name: Create SHA Container Tag diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 397c2085..9e3d331d 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -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 01ed1daf..a3df5b1a 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: createSentryRelease: 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] env: |