Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge main into feature/relational-db #105

Merged
4 changes: 2 additions & 2 deletions .github/workflows/pick-to-staging.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Cherry pick staging PRs merged into main

on:
pull_request:
pull_request_target:
types:
- closed
branches:
Expand All @@ -25,7 +25,7 @@ jobs:

- name: Fetch and checkout latest staging branch
run: |
branch=$(git ls-remote --heads origin 'staging*' | tail -1 | awk 'gsub(".*refs/heads/","")')
branch=$(git ls-remote --heads origin 'staging/*' | awk 'gsub(".*refs/heads/","")' | sort -V | tail -1)
git fetch origin $branch
git checkout $branch

Expand Down
2 changes: 1 addition & 1 deletion dev/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ black==24.4.2
flake8==7.0.0
isort==5.13.2
mypy==1.10.0
pytest==8.2.0
pytest==8.2.1
pyupgrade==3.15.2
pyyaml==6.0.1
simplejson==3.19.2
Expand Down
3 changes: 3 additions & 0 deletions models.yml
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,9 @@ user:
type: string
required: true
restriction_mode: B
member_number:
type: string
restriction_mode: B
saml_id:
type: string
minLength: 1
Expand Down