This merge brings the full 1.1-dev integration stream into the 1.1 line so ONgDB 1.1 can ship enterprise capabilities on top of the community core with public, reproducible CI and audited release controls. #124
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| # ONgDB branch model and CI gates | ||
|
|
||
| Public repository: [`graphfoundation/ongdb`](https://github.com/graphfoundation/ongdb). | ||
|
|
||
| | Ref | Purpose | Required CI | Produces release? | | ||
| |-----|---------|-------------|-------------------| | ||
| | `*-dev` (e.g. `1.1-dev`) | Integration | **`dev-quality-gate`** (module-aware) | **No** | | ||
| | Release lines `1.0` / `1.1` / `2.0` | Audited ship lines | **`full-reactor`** + nightly | Tags only | | ||
| | Tags `1.1.*` | Immutable release pointer | `release.yml` + Environment `release` | Yes | | ||
|
|
||
| Details: ongdb-dev [CI-BRANCH-STRATEGY.md](https://github.com/graphfoundation/ongdb-dev) (docs) / product scripts under `.github/scripts/`. | ||
|
|
||
| ## Flow | ||
|
|
||
| 1. Optional: push WIP to private remote `dev` (`graphfoundation/ongdb-dev`). | ||
| 2. PR into **`1.1-dev`** → `dev-quality-gate` (changed modules + `-am`/`-amd`, or full if blast radius is large). | ||
| 3. Audit PR **`1.1-dev` → `1.1`** → must pass **`full-reactor`**. | ||
| 4. Tag `1.1.x` / `1.1.0-rc01` from `1.1` → approve Environment **`release`**. | ||
|
|
||
| **Invariant:** GitHub Release assets come only from a tag on protected `1.1` after Environment approval. Nightly snapshots are not releases. | ||
|
|
||
| ## Repository settings | ||
|
|
||
| ```bash | ||
| .github/scripts/apply-github-settings.sh | ||
| ``` | ||
|
|
||
| That script sets: | ||
|
|
||
| - Release branches `1.0`, `1.1`, `2.0` → require `full-reactor` | ||
| - Dev branches `1.0-dev`, `1.1-dev`, `2.0-dev` → require `dev-quality-gate` | ||
| - Environment `release` with required reviewer | ||
|
|
||
| **Nightly cron:** loaded from the repo **default** branch; builds matrix `1.0`, `1.1`, `2.0`. | ||
|
|
||
| ## Tag discipline | ||
|
|
||
| ```bash | ||
| git fetch origin 1.1 | ||
| git checkout 1.1 && git pull --ff-only origin 1.1 | ||
| # versions:set to match tag, then: | ||
| git tag -a 1.1.0-rc01 -m "ONgDB 1.1.0-rc01" | ||
| git push origin 1.1.0-rc01 | ||
| ``` | ||
|
|
||
| `release.yml` fails if the tagged commit is not an ancestor of `origin/1.1`. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| # Release-sensitive paths require review from maintainers on PRs into protected | ||
| # release lines (e.g. 1.1). Update the owner list when the maintainer team changes. | ||
| # Docs: .github/BRANCHING.md | ||
|
|
||
| * @bradnussbaum | ||
|
|
||
| /.github/ @bradnussbaum | ||
| /enterprise/ @bradnussbaum | ||
| /packaging/ @bradnussbaum |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| #!/usr/bin/env bash | ||
| # Apply branch protection for release vs dev lines on graphfoundation/ongdb. | ||
| # Requires: gh auth with admin on the repo. | ||
| set -euo pipefail | ||
|
|
||
| REPO="${REPO:-graphfoundation/ongdb}" | ||
| REVIEWER_LOGIN="${RELEASE_REVIEWER:-$(gh api user --jq .login)}" | ||
| REVIEWER_ID="$(gh api "users/${REVIEWER_LOGIN}" --jq .id)" | ||
|
|
||
| echo "Applying settings to ${REPO}" | ||
| gh api user --jq .login >/dev/null | ||
|
|
||
| protect_release() { | ||
| local branch="$1" | ||
| echo "Release protection: ${branch} (require full-reactor)" | ||
| gh api -X PUT "repos/${REPO}/branches/${branch}/protection" --input - <<EOF | ||
| { | ||
| "required_status_checks": { | ||
| "strict": true, | ||
| "contexts": ["full-reactor"] | ||
| }, | ||
| "enforce_admins": true, | ||
| "required_pull_request_reviews": { | ||
| "required_approving_review_count": 1, | ||
| "dismiss_stale_reviews": true, | ||
| "require_code_owner_reviews": true | ||
| }, | ||
| "restrictions": null, | ||
| "allow_force_pushes": false, | ||
| "allow_deletions": false, | ||
| "required_conversation_resolution": true | ||
| } | ||
| EOF | ||
| } | ||
|
|
||
| protect_dev() { | ||
| local branch="$1" | ||
| echo "Dev protection: ${branch} (require dev-quality-gate)" | ||
| gh api -X PUT "repos/${REPO}/branches/${branch}/protection" --input - <<EOF | ||
| { | ||
| "required_status_checks": { | ||
| "strict": true, | ||
| "contexts": ["dev-quality-gate"] | ||
| }, | ||
| "enforce_admins": false, | ||
| "required_pull_request_reviews": null, | ||
| "restrictions": null, | ||
| "allow_force_pushes": false, | ||
| "allow_deletions": false | ||
| } | ||
| EOF | ||
| } | ||
|
|
||
| for b in 1.0 1.1 2.0; do | ||
| protect_release "$b" || echo "WARN: could not protect ${b} (branch missing?)" | ||
| done | ||
|
|
||
| for b in 1.0-dev 1.1-dev 2.0-dev; do | ||
| protect_dev "$b" || echo "WARN: could not protect ${b} (branch missing?)" | ||
| done | ||
|
|
||
| gh api -X PUT "repos/${REPO}/environments/release" --input - <<EOF | ||
| { | ||
| "wait_timer": 0, | ||
| "prevent_self_review": false, | ||
| "reviewers": [ | ||
| {"type": "User", "id": ${REVIEWER_ID}} | ||
| ], | ||
| "deployment_branch_policy": null | ||
| } | ||
| EOF | ||
| echo "Environment 'release' ensured with reviewer @${REVIEWER_LOGIN}." | ||
| echo | ||
| echo "Manual: Org Billing → Actions spend budget (larger runners \$0)." | ||
| echo "Ensure nightly.yml + full-reactor-public.yml exist on each release line (or default branch)." |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| #!/usr/bin/env bash | ||
| # Map git changes to Maven module paths for -pl / -am / -amd. | ||
| # Usage: changed-maven-modules.sh <base-ref> | ||
| # Writes to GITHUB_OUTPUT (if set) and stdout: | ||
| # mode=skip|affected|full | ||
| # modules=path1,path2 (only when mode=affected) | ||
| set -euo pipefail | ||
|
|
||
| BASE_REF="${1:?Usage: $0 <base-ref>}" | ||
|
|
||
| if ! git rev-parse --verify "$BASE_REF" >/dev/null 2>&1; then | ||
| echo "Base ref not found: $BASE_REF — defaulting to full reactor" >&2 | ||
| MODE=full | ||
| MODULES= | ||
| else | ||
| mapfile -t CHANGED < <(git diff --name-only "$BASE_REF"...HEAD | sed '/^$/d' || true) | ||
|
|
||
| if [[ ${#CHANGED[@]} -eq 0 ]]; then | ||
| MODE=skip | ||
| MODULES= | ||
| else | ||
| declare -A MOD_SET=() | ||
| FORCE_FULL=0 | ||
| ONLY_DOCS=1 | ||
|
|
||
| for f in "${CHANGED[@]}"; do | ||
| case "$f" in | ||
| *.md|*.adoc|*.txt|LICENSE*|NOTICE*|COPYRIGHT*|.gitignore) | ||
| continue | ||
| ;; | ||
| .github/workflows/*|.github/scripts/*|pom.xml|build-resources/*) | ||
| FORCE_FULL=1 | ||
| ONLY_DOCS=0 | ||
| ;; | ||
| *) | ||
| ONLY_DOCS=0 | ||
| ;; | ||
| esac | ||
|
|
||
| # Walk up to nearest directory containing pom.xml (module root) | ||
| dir="$(dirname "$f")" | ||
| while [[ "$dir" != "." && "$dir" != "/" ]]; do | ||
| if [[ -f "${dir}/pom.xml" ]]; then | ||
| # Root pom → full reactor | ||
| if [[ "$dir" == "." ]]; then | ||
| FORCE_FULL=1 | ||
| else | ||
| MOD_SET["$dir"]=1 | ||
| fi | ||
| break | ||
| fi | ||
| parent="$(dirname "$dir")" | ||
| [[ "$parent" == "$dir" ]] && break | ||
| dir="$parent" | ||
| done | ||
| if [[ -f pom.xml && ( "$f" == pom.xml || "$dir" == "." ) ]]; then | ||
| if [[ "$f" == pom.xml ]]; then | ||
| FORCE_FULL=1 | ||
| fi | ||
| fi | ||
| done | ||
|
|
||
| if [[ "$ONLY_DOCS" -eq 1 ]]; then | ||
| MODE=skip | ||
| MODULES= | ||
| elif [[ "$FORCE_FULL" -eq 1 ]]; then | ||
| MODE=full | ||
| MODULES= | ||
| else | ||
| MODULES="$(printf '%s\n' "${!MOD_SET[@]}" | sort | paste -sd, -)" | ||
| if [[ -z "$MODULES" ]]; then | ||
| MODE=full | ||
| else | ||
| # Cap: too many modules → full reactor is simpler/faster than huge -pl lists | ||
| COUNT="$(awk -F',' '{print NF}' <<<"$MODULES")" | ||
| if [[ "$COUNT" -gt 25 ]]; then | ||
| MODE=full | ||
| MODULES= | ||
| else | ||
| MODE=affected | ||
| fi | ||
| fi | ||
| fi | ||
| fi | ||
| fi | ||
|
|
||
| echo "mode=${MODE}" | ||
| echo "modules=${MODULES}" | ||
| if [[ -n "${GITHUB_OUTPUT:-}" ]]; then | ||
| echo "mode=${MODE}" >> "$GITHUB_OUTPUT" | ||
| echo "modules=${MODULES}" >> "$GITHUB_OUTPUT" | ||
| fi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| #!/usr/bin/env bash | ||
| # Smoke-test an ONgDB standalone unix tarball: extract, start, wait for HTTP, stop. | ||
| set -euo pipefail | ||
|
|
||
| TARBALL="${1:?Usage: tarball-smoke.sh <ongdb-*-unix.tar.gz>}" | ||
| if [[ ! -f "$TARBALL" ]]; then | ||
| echo "Tarball not found: $TARBALL" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| WORKDIR="$(mktemp -d)" | ||
| cleanup() { | ||
| if [[ -n "${ONGDB_HOME:-}" && -x "${ONGDB_HOME}/bin/ongdb" ]]; then | ||
| "${ONGDB_HOME}/bin/ongdb" stop || true | ||
| fi | ||
| rm -rf "$WORKDIR" | ||
| } | ||
| trap cleanup EXIT | ||
|
|
||
| tar -xzf "$TARBALL" -C "$WORKDIR" | ||
| ONGDB_HOME="$(find "$WORKDIR" -mindepth 1 -maxdepth 1 -type d | head -n 1)" | ||
| if [[ -z "$ONGDB_HOME" || ! -x "${ONGDB_HOME}/bin/ongdb" ]]; then | ||
| echo "Could not locate bin/ongdb under extracted tarball" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "Starting ONgDB from ${ONGDB_HOME}" | ||
| "${ONGDB_HOME}/bin/ongdb" start | ||
|
|
||
| HTTP_PORT=7474 | ||
| ATTEMPTS=0 | ||
| RETRIES=90 | ||
| STATUS=0 | ||
| until [[ "$STATUS" == "200" ]]; do | ||
| ATTEMPTS=$((ATTEMPTS + 1)) | ||
| STATUS="$(curl -s -o /dev/null -w '%{http_code}' --connect-timeout 1 --max-time 3 \ | ||
| "http://127.0.0.1:${HTTP_PORT}" || echo 0)" | ||
| if [[ "$ATTEMPTS" -gt "$RETRIES" ]]; then | ||
| echo "ONgDB did not become ready on :${HTTP_PORT} within ${RETRIES}s (last status=${STATUS})" >&2 | ||
| "${ONGDB_HOME}/bin/ongdb" status || true | ||
| exit 1 | ||
| fi | ||
| sleep 1 | ||
| done | ||
|
|
||
| echo "ONgDB HTTP ready (status ${STATUS}) after ${ATTEMPTS}s" | ||
| "${ONGDB_HOME}/bin/ongdb" stop | ||
| echo "Tarball smoke OK: $(basename "$TARBALL")" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| # Full-reactor CI — required on release lines (1.0, 1.1, 2.0). | ||
| # Also runs on pushes to those branches. Dev lines use pr-dev.yml instead. | ||
| # See ongdb-dev/ongdb-11/CI-BRANCH-STRATEGY.md | ||
|
|
||
| name: Public full reactor | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - '1.0' | ||
| - '1.1' | ||
| - '2.0' | ||
| pull_request: | ||
| branches: | ||
| - '1.0' | ||
| - '1.1' | ||
| - '2.0' | ||
| workflow_dispatch: | ||
| inputs: | ||
| branch: | ||
| description: Optional branch to build (defaults to event branch) | ||
| required: false | ||
| type: string | ||
|
|
||
| concurrency: | ||
| group: full-reactor-${{ github.repository }}-${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| env: | ||
| MAVEN_OPTS: -Xmx4g | ||
| JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8 | ||
|
|
||
| jobs: | ||
| full-reactor: | ||
| if: github.repository == 'graphfoundation/ongdb' | ||
| runs-on: ubuntu-latest | ||
| timeout-minutes: 480 | ||
| permissions: | ||
| contents: read | ||
| steps: | ||
| - name: Resolve checkout ref | ||
| id: target | ||
| run: | | ||
| set -euo pipefail | ||
| if [[ "${{ github.event_name }}" == "workflow_dispatch" && -n "${{ inputs.branch }}" ]]; then | ||
| ref="${{ inputs.branch }}" | ||
| elif [[ "${{ github.event_name }}" == "pull_request" ]]; then | ||
| ref="${{ github.head_ref }}" | ||
| else | ||
| ref="${GITHUB_REF_NAME}" | ||
| fi | ||
| echo "ref=${ref}" >> "$GITHUB_OUTPUT" | ||
| echo "Selected ref: ${ref}" | ||
|
|
||
| - uses: actions/checkout@v5 | ||
| with: | ||
| fetch-depth: 0 | ||
| ref: ${{ steps.target.outputs.ref }} | ||
|
There was a problem hiding this comment. Fork PR checkout uses head refMedium Severity For   Reviewed by Cursor Bugbot for commit 1f28a5d. Configure here. |
||
|
|
||
| - name: Raise open file limit | ||
| run: ulimit -n 40000 && ulimit -n | ||
|
|
||
| - name: Resolve Java version for branch | ||
| id: java | ||
| run: | | ||
| set -euo pipefail | ||
| java_version="8" | ||
| case "${{ steps.target.outputs.ref }}" in | ||
| 2.*) | ||
| java_version="11" | ||
| ;; | ||
| esac | ||
| echo "version=${java_version}" >> "$GITHUB_OUTPUT" | ||
| echo "Using Java ${java_version}" | ||
|
There was a problem hiding this comment. Wrong Java on PR buildsHigh Severity For pull requests, the workflow determines the Java version based on the PR's source branch ( Reviewed by Cursor Bugbot for commit d296273. Configure here. |
||
|
|
||
| - name: Set up JDK | ||
| uses: actions/setup-java@v5 | ||
| with: | ||
| java-version: ${{ steps.java.outputs.version }} | ||
| distribution: temurin | ||
| cache: maven | ||
|
|
||
| - name: Full reactor clean install | ||
| run: | | ||
| set -euo pipefail | ||
| mvn -B -Drevapi.skip=true clean install | tee full-reactor-build.log | ||
|
|
||
| - name: Upload full-reactor artifacts and logs | ||
| if: always() | ||
| uses: actions/upload-artifact@v6 | ||
| with: | ||
| name: full-reactor-${{ steps.target.outputs.ref }}-${{ github.run_id }} | ||
| path: | | ||
| full-reactor-build.log | ||
| **/target/surefire-reports/** | ||
| **/target/failsafe-reports/** | ||
| packaging/standalone/target/ongdb-community-*-unix.tar.gz | ||
| packaging/standalone/target/ongdb-enterprise-*-unix.tar.gz | ||
| packaging/standalone/target/ongdb-community-*-windows.zip | ||
| packaging/standalone/target/ongdb-enterprise-*-windows.zip | ||
| if-no-files-found: ignore | ||
| retention-days: 30 | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Txt changes skip Maven gate
Medium Severity
The dev gate treats every
*.txtpath (including moduleLICENSES.txt/NOTICE.txt) as non-build documentation. If a PR changes only those files,mode=skipandpr-dev.ymlcompletes without running Maven, even when licensing or packaging checks would fail a full build.Reviewed by Cursor Bugbot for commit d296273. Configure here.