From ca9c8729f9c941724fb661bf32148d30836c3a24 Mon Sep 17 00:00:00 2001
From: Luisa <luisa.beerboom@intevation.de>
Date: Tue, 7 May 2024 11:56:40 +0200
Subject: [PATCH 1/4] New user field member_number
---
models.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/models.yml b/models.yml
index a08043f1..b7f51449 100644
--- a/models.yml
+++ b/models.yml
@@ -252,6 +252,9 @@ user:
type: string
required: true
restriction_mode: B
+ member_number:
+ type: string
+ restriction_mode: B
saml_id:
type: string
minLength: 1
From f66043f78f99a78dcf27cb475b488867bc9393bc Mon Sep 17 00:00:00 2001
From: Adrian Richter <adrian@intevation.de>
Date: Wed, 15 May 2024 15:17:55 +0200
Subject: [PATCH 2/4] pick-to-staging: Trigger on pr_target event type
---
.github/workflows/pick-to-staging.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/pick-to-staging.yml b/.github/workflows/pick-to-staging.yml
index 076a8764..dacf79ba 100644
--- a/.github/workflows/pick-to-staging.yml
+++ b/.github/workflows/pick-to-staging.yml
@@ -1,7 +1,7 @@
name: Cherry pick staging PRs merged into main
on:
- pull_request:
+ pull_request_target:
types:
- closed
branches:
From 037134844eb2328b1ffc7ef016e61e0a95e99210 Mon Sep 17 00:00:00 2001
From: Adrian Richter <adrian@intevation.de>
Date: Fri, 17 May 2024 11:02:10 +0200
Subject: [PATCH 3/4] Properly sort staging/* refs to get latest branch
---
.github/workflows/pick-to-staging.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/pick-to-staging.yml b/.github/workflows/pick-to-staging.yml
index dacf79ba..7191ed4d 100644
--- a/.github/workflows/pick-to-staging.yml
+++ b/.github/workflows/pick-to-staging.yml
@@ -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
From 2a46d724de1dd66caa5c80a2516b263e883de39c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 23:29:35 +0000
Subject: [PATCH 4/4] --- updated-dependencies: - dependency-name: pytest
dependency-type: direct:production update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
---
dev/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/requirements.txt b/dev/requirements.txt
index 1b2ae9f3..78e86119 100644
--- a/dev/requirements.txt
+++ b/dev/requirements.txt
@@ -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