Skip to content

Release v2.0.3 - #386

Closed
github-actions[bot] wants to merge 220 commits into
masterfrom
release/2.0.3
Closed

github-actions[bot] wants to merge 220 commits into
masterfrom
release/2.0.3

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

No description provided.

adskyiproger and others added 30 commits March 16, 2026 14:30
use proxy instead of the direct issuer - it adds issuerKey
* configure public env variables for MOSIP Collab

* add mosip api secrets to deployment

* move secrets / variables to appropriate places

* bump version

* disable not needed mocks

* update esignet urls

* Update Verifiable Credentials URLs in values.override.yaml

use proxy instead of the direct issuer - it adds issuerKey

---------

Co-authored-by: Vadym Mudryi <vadym.mudryi@gmail.com>
add reference data related secrets and mappings
chore: remove webhooks from infra
tahmidrahman-dsi and others added 28 commits August 24, 2026 18:03
- default master, so manual runs behave as before
- skip the develop merge-back when targeting a release branch

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Mirrors opencrvs-core's init-release change, driven by the target_branch
core passes down. When the target is a release branch rather than master
this repo opens no release PR: it cuts merge-back/release-<version>-into-<target>
from the target, merges the release branch into it, and PRs that into
the target. Conflicts confined to the CHANGELOG and the chart/image
version lines in the deploy workflows resolve to the target channel's
copy and are noted in the PR body; anything else aborts.

A target branch that does not exist yet is cut from master and given the
same chart version bump and CHANGELOG section a normal init-release run
would have written.

Merge-back branch names now strip dots, matching the other repos.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Replaces the step that cut and initialised a missing target branch with
a check that fails before anything is created. That release writes its
own version bump and CHANGELOG, and a placeholder branch would make its
own init-release run skip them. opencrvs-core resolves the target — now
the next unreleased patch of the channel directly above the release's
own — and passes it down; this repo only verifies it is there.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Quality pass over the release workflow, no behaviour change:

- one `Configure the git identity` step instead of the same two git config
  lines in two places
- a `create_pr` helper instead of the "list, then create unless open" block
  written out twice
- drop the `release_pr` output and the `target_slug` variable — both restate
  the target branch — and use bash parameter expansion for the dot-stripping
  instead of `echo | tr` subshells
- resolve the expected merge conflicts with one `git checkout --ours` over the
  pathspec, staging just those files rather than `git add -A`
- one `git fetch` for both refs the older-channel path needs

Comments are about a quarter shorter: the header is a plain list of what the
workflow does, and each step comment gives the reason rather than restating
the code.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Merging the release branch into the target during CI aborts the release
init whenever the two channels disagree — core's 1.9.17 run died on
modify/delete conflicts for packages 2.x dropped, before any PR,
companion dispatch or draft release happened.

The merge-back branch is now a copy of release/<version> whichever
channel it targets, the same as the merge-back to develop has always
worked: the branch exists so that the commits resolving conflicts with
the target stay off the release branch, and whoever merges the PR does
that resolution.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…lease

Restores the branch shape core's workflow was designed around: for an
older channel the merge-back branch is cut from the target and the
release branch merged into it, so the PR diff is only what that channel
adds.

What broke core's 1.9.17 run is fixed instead of avoided: a conflict
outside the version/CHANGELOG class abandons the merge, skips the branch
and its PR, and writes the job summary rather than failing the run; and
modify/delete conflicts now resolve, keeping the target's deletions.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Core no longer reads SENTRY_DSN, so drop the Sentry DSN prompt from
environment setup and the sentry.io reachability check from bootstrap.
Same pass core just had, minus the parts that do not apply here — core
still resolves the target branch and passes it in as target_branch.

- VERSION and RELEASE_BRANCH as workflow-level env, so the version stops
  being interpolated into every command
- the separate "check if release branch exists" step folded into the
  branch creation as an early exit
- the draft release and its tag deletion are one step, since the second
  only undid what the first had just done
- shorter names (BRANCH, TARGET), CHANGELOG.new + mv instead of the copy
  dance, and comments cut to why rather than what

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…379)

* fix: Make provision user and group ids not rely on hardcoded values

* fix: Local provision scripts
ci: accept target_branch from core for older-channel releases
fix(ocrvs-13460): remove Sentry provisioning
chore: merge release v1.9.17 into release/2.0.2
@cibelius
cibelius deleted the branch master September 30, 2026 10:29
@cibelius cibelius closed this Sep 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants