Skip to content

Commit

Permalink
Merge branch 'main' into no-more-previews-for-redirects
Browse files Browse the repository at this point in the history
  • Loading branch information
HassanAbouelela authored Sep 20, 2023
2 parents c46f64c + 1ff3169 commit db8ad7b
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 30 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,11 @@ jobs:
environment: production

steps:
# Check out the private Kubernetes repository for the
# deployment.yaml file using a GitHub Personal Access
# Token to get access.
- name: Checkout code
uses: actions/checkout@v4
with:
repository: python-discord/kubernetes
repository: python-discord/infra
path: infra

- uses: azure/setup-kubectl@v3

Expand All @@ -78,7 +76,7 @@ jobs:
uses: Azure/k8s-deploy@v4
with:
manifests: |
namespaces/default/site/deployment.yaml
infra/kubernetes/namespaces/default/site/deployment.yaml
images: 'ghcr.io/python-discord/site:${{ inputs.sha-tag }}'

- name: Purge Cloudflare Edge Cache
Expand Down
44 changes: 22 additions & 22 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,6 @@ The website is configured through the following environment variables:
# Next steps
Now that you have everything setup, it is finally time to make changes to the site! If you have not yet read the [contributing guidelines](../contributing-guidelines.md), now is a good time. Contributions that do not adhere to the guidelines may be rejected.

If you're not sure where to go from here, our [detailed walkthrough](../#2-set-up-the-project) is for you.
If you're not sure where to go from here, our [detailed walkthrough](../#2-set-up-the-project), or the [guide on contributing a page](../../how-to-contribute-a-page) is for you.

Have fun!
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ python = "3.11.*"
django = "4.2.5"
django-distill = "3.1.3"
django-environ = "0.11.2"
django-filter = "23.2"
django-filter = "23.3"
django-prometheus = "2.3.1"
django-simple-bulma = "2.5.0"
djangorestframework = "3.14.0"
Expand All @@ -29,7 +29,7 @@ psycopg = {extras = ["binary"], version = "3.1.10"}
[tool.poetry.group.dev.dependencies]
python-dotenv = "1.0.0"
taskipy = "1.12.0"
ruff = "0.0.289"
ruff = "0.0.290"

[tool.poetry.group.lint.dependencies]
pre-commit = "3.4.0"
Expand Down

0 comments on commit db8ad7b

Please sign in to comment.