Skip to content

Promote staging to master: numbered release tags (INFRA-511) - #8

Merged
rkkmkkfx merged 29 commits into
masterfrom
staging
Oct 9, 2026
Merged

rkkmkkfx merged 29 commits into
masterfrom
staging

Conversation

@rkkmkkfx

@rkkmkkfx rkkmkkfx commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

Merge with a merge commit (gh pr merge --merge). Do NOT squash or rebase. Do not delete the staging branch.

Merging this deploys PRODUCTION immediately.

The GitHub Actions workflow (.github/workflows/deploy.yml) runs on every push to master: builds the jar, copies it to /apps/docs-prod/ on api-bible-docs (104.236.66.244) and worker (68.183.148.118), restarts docs-prod on both. Prod runs a Oct 2018 / Feb 2019 jar, so this ships everything below, not just the dropdown fix.

What changes on prod (29 commits)

  • Fix (INFRA-511): released-version? accepts v7/v8 + N.N.N tags from major 9 up; v9, other branches and old 8.x.x tags stay hidden (+ unit test). Verified on the real content-repo refs: old filter kept v7 v8 v9, new keeps 9.0.0 v7 v8. Same fix already live on api.anychart.com.
  • Notifications: skype/slack replaced by Discord; the config spec now requires [notifications.discord] webhook-url. Already deployed to both hosts' docs-prod.toml (servers-conf#72, eb20a1c); verified: current prod TOML + this spec = valid.
  • Deps: link-checker 0.2.10 → 0.3.1, selmer 1.12.2 → 1.12.3, ring-core 1.7.0 → 1.7.1, markdown-clj 1.0.4 → 1.0.5, clj-time 0.15.0 → 0.15.1.
  • UI: footer (X and Medium icons, new AnyChart font URL), templates, rebuilt front-end assets.
  • CI: Travis replaced by GitHub Actions; pinned host keys.
  • Docs: ARCHITECTURE.md + README (merged from master in chore: merge master into staging #7).
  • No DB schema changes. staging code has run on stg since Mar 2025; stg was redeployed from this code today.

Prep done

  • Content repo docs.anychart.com: duplicate 9.0.0 and v9 branches deleted (all were 6bb0794, tag 9.0.0 stays). Without this the build checks out 9.0.0 twice in parallel into one dir and fails with EOF while reading (that is what happened on api.anychart.com).
  • docs-prod.toml has [notifications.discord] on both hosts
  • Old prod jars backed up and SHA-256 verified on both hosts (*.prod-bak-20261009-1738)
  • master has no commits staging lacks; dry-run merge is clean

After merge (not automatic)

The version list changes only when the worker rebuilds. Trigger it on the app's local port (public /_update_ is behind basic auth), after copying v9's output aside. The rebuild removes v9 and builds 9.0.0; until it finishes latest serves v8.

Rollback (per host)

cp -p /apps/docs-prod/docs-2.0-standalone.jar.prod-bak-20261009-1738 /apps/docs-prod/docs-2.0-standalone.jar && supervisorctl restart docs-prod

Test plan

  • TODO: merge with a merge commit; watch the deploy run
  • TODO: supervisorctl status docs-prod RUNNING on both hosts; docs.anychart.com returns 200
  • TODO: rebuild; docs.anychart.com dropdown lists 9.0.0, v8, v7

JIRA: INFRA-511

🤖 Generated with Claude Code

ilevd and others added 29 commits October 31, 2018 09:34
Added a link to AnyChart's Medium blog to the footer social icons.
Also adjusted the grid columns for the social icons for equal
spacing.
This commit adds spacing and adjusts sizes for social icons in
the footer to enhance visual appeal and readability.
released-version? only matched ^v\d+$, so release tags such as 9.0.0 were
filtered out of the build and the version dropdown. Accept legacy v7/v8
branches plus N.N.N tags from major 9 up; v9+ and older 8.x.x tags stay hidden.

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Travis is gone, so merges to staging/master no longer deployed. Build the
uberjar, scp it to api-bible-docs and worker, restart the supervisor
program, as .travis.yml did. Needs repo secret DEPLOY_SSH_KEY.

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
The Travis-era keys no longer match, so strict host checking refused the
connection. Keys taken from the live hosts and cross-checked against the
fingerprints already trusted in a maintainer's known_hosts.

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Brings master's only unique commits (ARCHITECTURE.md and README docs, 2026-02)
into staging so staging -> master promotes with a merge commit and no conflict.
.travis.yml and .travis/known_hosts: kept staging's version.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 9, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-09T18:01:54.025377Z 5de1be4 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@rkkmkkfx
rkkmkkfx merged commit 7f5aa93 into master Oct 9, 2026
1 check passed
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.

2 participants