From a12bd0bb712daa2e735634a039679da756793813 Mon Sep 17 00:00:00 2001 From: Jacob Scott Date: Tue, 17 Oct 2023 13:33:21 +0100 Subject: [PATCH 1/4] Create workflow remove-stale-branches.yml --- .github/workflows/remove-stale-branches.yml | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/remove-stale-branches.yml diff --git a/.github/workflows/remove-stale-branches.yml b/.github/workflows/remove-stale-branches.yml new file mode 100644 index 0000000000..b50cac6171 --- /dev/null +++ b/.github/workflows/remove-stale-branches.yml @@ -0,0 +1,23 @@ +on: + workflow_dispatch: # this will eventually be a cron job - for now it is used in manual testing + inputs: + days_before_stale: + type: number + default: 30 + days_before_delete: + type: number + default: 14 + +jobs: + remove-stale-branches: + name: Remove stale branches + runs-on: ubuntu-latest + steps: + - uses: fpicalausa/remove-stale-branches@v1.5.8 + with: + dry-run: true + days-before-branch-stale: ${{ inputs.days_before_stale }} + days-before-branch-delete: ${{ inputs.days_before_delete }} + stale-branch-message: "@{author} The branch [{branchName}]({branchUrl}) hasn't been updated in the last 30 days and is marked as stale. It will be removed in 14 days.\r\nIf you want to keep this branch around, delete this comment or add new commits to this branch." + exempt-protected-branches: true + exempt-branches-regex: "^(release\\/|feature\\/|poc\\/).*" From 6211fc37e8d536a09c05993bd3d45fc4cf04e728 Mon Sep 17 00:00:00 2001 From: Jacob Scott Date: Tue, 17 Oct 2023 15:44:34 +0100 Subject: [PATCH 2/4] Add cron job to stale branch workflow --- .github/workflows/remove-stale-branches.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/remove-stale-branches.yml b/.github/workflows/remove-stale-branches.yml index b50cac6171..25dd1b9f8c 100644 --- a/.github/workflows/remove-stale-branches.yml +++ b/.github/workflows/remove-stale-branches.yml @@ -1,12 +1,7 @@ -on: - workflow_dispatch: # this will eventually be a cron job - for now it is used in manual testing - inputs: - days_before_stale: - type: number - default: 30 - days_before_delete: - type: number - default: 14 +name: 'Remove stale branches' +on: + schedule: + - cron: '0 0 * * 1-5' jobs: remove-stale-branches: @@ -16,8 +11,9 @@ jobs: - uses: fpicalausa/remove-stale-branches@v1.5.8 with: dry-run: true - days-before-branch-stale: ${{ inputs.days_before_stale }} - days-before-branch-delete: ${{ inputs.days_before_delete }} + days-before-branch-stale: 30 + days-before-branch-delete: 14 stale-branch-message: "@{author} The branch [{branchName}]({branchUrl}) hasn't been updated in the last 30 days and is marked as stale. It will be removed in 14 days.\r\nIf you want to keep this branch around, delete this comment or add new commits to this branch." exempt-protected-branches: true exempt-branches-regex: "^(release\\/|feature\\/|poc\\/).*" + operations-per-run: 30 From 262d21be346a51516ddd60674ce3095b1dd7dbfe Mon Sep 17 00:00:00 2001 From: Owen Stanford <92725587+owenstanford@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:28:39 +0100 Subject: [PATCH 3/4] CORE-17502 Added token selection worker HTTP endpoint definition. (#1313) --- .../src/main/java/net/corda/schema/configuration/BootConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/data/config-schema/src/main/java/net/corda/schema/configuration/BootConfig.java b/data/config-schema/src/main/java/net/corda/schema/configuration/BootConfig.java index de0f1452b0..219239b23d 100644 --- a/data/config-schema/src/main/java/net/corda/schema/configuration/BootConfig.java +++ b/data/config-schema/src/main/java/net/corda/schema/configuration/BootConfig.java @@ -47,4 +47,5 @@ private BootConfig() { public static final String VERIFICATION_WORKER_REST_ENDPOINT = BOOT_WORKER_SERVICE + ".endpoints.verification"; public static final String UNIQUENESS_WORKER_REST_ENDPOINT = BOOT_WORKER_SERVICE + ".endpoints.uniqueness"; public static final String PERSISTENCE_WORKER_REST_ENDPOINT = BOOT_WORKER_SERVICE + ".endpoints.persistence"; + public static final String TOKEN_SELECTION_WORKER_REST_ENDPOINT = BOOT_WORKER_SERVICE + ".endpoints.tokenSelection"; } From eb1d079b35e9d4db1108eebc566f6af7389ee77a Mon Sep 17 00:00:00 2001 From: Miljenko Brkic <97448832+mbrkic-r3@users.noreply.github.com> Date: Tue, 24 Oct 2023 15:15:20 +0100 Subject: [PATCH 4/4] CORE-17768 Topology changes - Use new topics (#1306) Set permission for FlowMapper to send messages to Kafka topic "flow.mapper.session.in" Set permission for TokenSelection to send messages to Kafka topic "flow.session" --- data/topic-schema/src/main/resources/net/corda/schema/Flow.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/topic-schema/src/main/resources/net/corda/schema/Flow.yaml b/data/topic-schema/src/main/resources/net/corda/schema/Flow.yaml index 5aed6fdbcf..04fd6571d9 100644 --- a/data/topic-schema/src/main/resources/net/corda/schema/Flow.yaml +++ b/data/topic-schema/src/main/resources/net/corda/schema/Flow.yaml @@ -114,6 +114,7 @@ topics: consumers: - flowMapper producers: + - flowMapper - link-manager config: FlowStart: @@ -129,5 +130,6 @@ topics: - flow producers: - flowMapper + - tokenSelection config: