diff options
| author | 2021-10-17 10:58:33 +0100 | |
|---|---|---|
| committer | 2021-10-17 10:58:33 +0100 | |
| commit | 662c9a6c5779f5969d77ef327e7c85e9574c1608 (patch) | |
| tree | 4982fff5bd644215f454f416b049674ab4695571 /.github | |
| parent | Raise for status to prevent parsing of invalid pages (diff) | |
| parent | Fixed delayed logs and made some other minor refactors (#1863) (diff) | |
Merge branch 'main' into doc-repetitive-outdated-warn
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/deploy.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/lint-test.yml | 30 | ||||
| -rw-r--r-- | .github/workflows/sentry_release.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/status_embed.yaml | 4 | 
5 files changed, 40 insertions, 8 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84a671917..f8f2c8888 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,10 @@ on:      types:        - completed +concurrency: +  group: ${{ github.workflow }}-${{ github.ref }} +  cancel-in-progress: true +  jobs:    build:      if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push' diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8b809b777..88abe6fb6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,6 +8,10 @@ on:      types:        - completed +concurrency: +  group: ${{ github.workflow }}-${{ github.ref }} +  cancel-in-progress: true +  jobs:    build:      environment: production @@ -38,6 +42,6 @@ jobs:          uses: Azure/k8s-deploy@v1          with:            manifests: | -              bot/deployment.yaml +              namespaces/default/bot/deployment.yaml            images: 'ghcr.io/python-discord/bot:${{ steps.sha_tag.outputs.tag }}'            kubectl-version: 'latest' diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index e99e6d181..f2c9dfb6c 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -6,11 +6,25 @@ on:        - main    pull_request: +concurrency: +  group: ${{ github.workflow }}-${{ github.ref }} +  cancel-in-progress: true  jobs:    lint-test:      runs-on: ubuntu-latest      env: +      # List of licenses that are compatible with the MIT License and +      # can be used in our project +      ALLOWED_LICENSE: Apache Software License; +        BSD License; +        GNU Library or Lesser General Public License (LGPL); +        ISC License (ISCL); +        MIT License; +        Mozilla Public License 2.0 (MPL 2.0); +        Public Domain; +        Python Software Foundation License +        # Dummy values for required bot environment variables        BOT_API_KEY: foo        BOT_SENTRY_DSN: blah @@ -67,6 +81,15 @@ jobs:            pip install poetry            poetry install +      # Check all of our non-dev dependencies are compatible with the MIT license. +      # If you added a new dependencies that is being rejected, +      # please make sure it is compatible with the license for this project, +      # and add it to the ALLOWED_LICENSE variable +      - name: Check Dependencies License +        run: | +          pip-licenses --allow-only="$ALLOWED_LICENSE" \ +            --package $(poetry export -f requirements.txt --without-hashes | sed "s/==.*//g" | tr "\n" " ") +        # This step caches our pre-commit environment. To make sure we        # do create a new environment when our pre-commit setup changes,        # we create a cache key based on relevant factors. @@ -100,13 +123,6 @@ jobs:        - name: Run tests and generate coverage report          run: pytest -n auto --cov --disable-warnings -q -      # This step will publish the coverage reports coveralls.io and -      # print a "job" link in the output of the GitHub Action -      - name: Publish coverage report to coveralls.io -        env: -            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -        run: coveralls -        # Prepare the Pull Request Payload artifact. If this fails, we        # we fail silently using the `continue-on-error` option. It's        # nice if this succeeds, but if it fails for any reason, it diff --git a/.github/workflows/sentry_release.yml b/.github/workflows/sentry_release.yml index f6a1e1f0e..48f5e50f4 100644 --- a/.github/workflows/sentry_release.yml +++ b/.github/workflows/sentry_release.yml @@ -5,6 +5,10 @@ on:      branches:        - main +concurrency: +  group: ${{ github.workflow }}-${{ github.ref }} +  cancel-in-progress: true +  jobs:    create_sentry_release:      runs-on: ubuntu-latest diff --git a/.github/workflows/status_embed.yaml b/.github/workflows/status_embed.yaml index b6a71b887..4178c366d 100644 --- a/.github/workflows/status_embed.yaml +++ b/.github/workflows/status_embed.yaml @@ -9,6 +9,10 @@ on:      types:        - completed +concurrency: +  group: ${{ github.workflow }}-${{ github.ref }} +  cancel-in-progress: true +  jobs:    status_embed:      # We need to send a status embed whenever the workflow  |