Skip to content

ci: switch deploy to rbio commands, inline branch resolution, rename CI_* -> DEPLOY_*#3590

Open
davidsmejia wants to merge 2 commits into
davidsmejia/3572-07-infrastructure-callersfrom
davidsmejia/3572-08-ci-workflow
Open

ci: switch deploy to rbio commands, inline branch resolution, rename CI_* -> DEPLOY_*#3590
davidsmejia wants to merge 2 commits into
davidsmejia/3572-07-infrastructure-callersfrom
davidsmejia/3572-08-ci-workflow

Conversation

@davidsmejia
Copy link
Copy Markdown
Contributor

@davidsmejia davidsmejia commented May 26, 2026

Issue Number

N/A

Purpose/Implementation Notes

  • .github/workflows/config.yml:

    • determine_branch step replaces get_deploy_branch (from common.sh) with inline regex on the tag suffix + git merge-base --is-ancestor for branch verification. Fails fast with ::error:: when a v-tag points at a commit not on the resolved branch.
    • The "Set $BRANCH and $CI_TAG" step (in deploy + deploy_hotfix) drops the common.sh source and reads needs.determine_branch.outputs.branch directly. Renames CI_TAG → DEPLOY_TAG to match rbio deploy:up's env.
    • Renames the CI_USERNAME env-block entry → DEPLOY_USER.
  • .github/scripts/remote_deploy.sh:

    • Drops the common.sh source + get_deploy_repo derivation.
    • Inlines BRANCH → (DEPLOY_ENV, DOCKERHUB_REPO, BATCH_USE_ON_DEMAND_INSTANCES) as a case statement at the top.
    • env_vars now carries DEPLOY_TAG, DEPLOY_USER, DEPLOY_ENV, DOCKERHUB_REPO, BATCH_USE_ON_DEMAND_INSTANCES (per-env values), plus SYSTEM_VERSION (mirrors DEPLOY_TAG for docker-bake.hcl) and PUSH_CACHE=true (matches update_docker_images.sh's old behavior).
    • Image build step: ./scripts/update_docker_images.sh -u -g deploy … → ./bin/rbio build --push deploy
    • Image existence check inlines docker_image_exists + ALL_IMAGES (the two remaining things this script needed from common.sh).
    • Final deploy step: .github/scripts/run_terraform.sh → ./bin/rbio deploy:up (rbio deploy:up reads DEPLOY_TAG/DEPLOY_USER/DEPLOY_ENV from env, runs tfenv install, shells to infrastructure/deploy.sh.)
    • CI_TAG references renamed to DEPLOY_TAG throughout (log paths, echo headers, etc.).
  • .github/scripts/slackpost_deploy.sh:

    • Reads $DEPLOY_USER / $BRANCH / $DEPLOY_TAG (which are now in env) rather than CI_* / re-deriving via git branch --contains.

Deploy-box precondition (must be done before this lands):

  • tfenv installed and on PATH for non-login ssh sessions. The first deploy after merge invokes rbio deploy:up, which calls tfenv install (reads infrastructure/.terraform-version=0.13.5).

Methods

N/A

Types of changes

  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Functional tests

N/A

Checklist

  • Lint and unit tests pass locally with my changes

Screenshots

N/A

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.

1 participant