Skip to content

Commit

Permalink
Merge branch '0.14' into feat/tp-rework
Browse files Browse the repository at this point in the history
  • Loading branch information
KShivendu committed Jul 6, 2023
2 parents 0e48151 + 90ccc1b commit c02bce9
Show file tree
Hide file tree
Showing 246 changed files with 14,709 additions and 6,795 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ workflows:
tags:
only: /dev-v[0-9]+(\.[0-9]+)*/
branches:
only: /test\/.*/
only: /test-cicd\/.*/
- publish:
context:
- slack-notification
Expand Down
20 changes: 10 additions & 10 deletions .circleci/config_continue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ workflows:
tags:
only: /dev-v[0-9]+(\.[0-9]+)*/
branches:
only: /test\/.*/
only: /test-cicd\/.*/
- test-unit:
requires:
- test-dev-tag-as-not-passed
Expand All @@ -198,7 +198,7 @@ workflows:
tags:
only: /dev-v[0-9]+(\.[0-9]+)*/
branches:
only: /test\/.*/
only: /test-cicd\/.*/
matrix:
parameters:
cdi-version: placeholder
Expand All @@ -211,7 +211,7 @@ workflows:
tags:
only: /dev-v[0-9]+(\.[0-9]+)*/
branches:
only: /test\/.*/
only: /test-cicd\/.*/
- test-website-flask:
requires:
- test-dev-tag-as-not-passed
Expand All @@ -221,7 +221,7 @@ workflows:
tags:
only: /dev-v[0-9]+(\.[0-9]+)*/
branches:
only: /test\/.*/
only: /test-cicd\/.*/
- test-website-django:
requires:
- test-dev-tag-as-not-passed
Expand All @@ -231,7 +231,7 @@ workflows:
tags:
only: /dev-v[0-9]+(\.[0-9]+)*/
branches:
only: /test\/.*/
only: /test-cicd\/.*/
- test-website-django2x:
requires:
- test-dev-tag-as-not-passed
Expand All @@ -241,7 +241,7 @@ workflows:
tags:
only: /dev-v[0-9]+(\.[0-9]+)*/
branches:
only: /test\/.*/
only: /test-cicd\/.*/
- test-authreact-fastapi:
requires:
- test-dev-tag-as-not-passed
Expand All @@ -251,7 +251,7 @@ workflows:
tags:
only: /dev-v[0-9]+(\.[0-9]+)*/
branches:
only: /test\/.*/
only: /test-cicd\/.*/
matrix:
parameters:
fdi-version: placeholder
Expand All @@ -264,7 +264,7 @@ workflows:
tags:
only: /dev-v[0-9]+(\.[0-9]+)*/
branches:
only: /test\/.*/
only: /test-cicd\/.*/
matrix:
parameters:
fdi-version: placeholder
Expand All @@ -277,7 +277,7 @@ workflows:
tags:
only: /dev-v[0-9]+(\.[0-9]+)*/
branches:
only: /test\/.*/
only: /test-cicd\/.*/
matrix:
parameters:
fdi-version: placeholder
Expand All @@ -297,4 +297,4 @@ workflows:
tags:
only: /dev-v[0-9]+(\.[0-9]+)*/
branches:
only: /test\/.*/
only: /test-cicd\/.*/
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
- If no such branch exists, then create one from the latest released branch.
- [ ] If have added a new web framework, update the `supertokens_python/utils.py` file to include that in the `FRAMEWORKS` variable
- [ ] If added a new recipe that has a User type with extra info, then be sure to change the User type in supertokens_python/types.py
- [ ] Make sure that `syncio` / `asyncio` functions are consistent.

## Remaining TODOs for this PR

Expand Down
Loading

0 comments on commit c02bce9

Please sign in to comment.