Bug 2029522 - Modernize CI workflow: docker compose v2 and actions/checkout@v4#2584
Merged
dklawren merged 2 commits intomozilla-bteam:masterfrom Apr 13, 2026
Merged
Bug 2029522 - Modernize CI workflow: docker compose v2 and actions/checkout@v4#2584dklawren merged 2 commits intomozilla-bteam:masterfrom
dklawren merged 2 commits intomozilla-bteam:masterfrom
Conversation
…eckout@v4 - Update actions/checkout from v3 to v4 (v3 uses deprecated Node 16) - Remove unnecessary `apt install docker-compose` steps — GitHub Actions runners already include Docker Compose v2 as a plugin - Replace `docker-compose` (v1, deprecated) with `docker compose` (v2) - Remove stale CircleCI ARG/ENV references from Dockerfile (CIRCLE_SHA1, CIRCLE_BUILD_URL) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
dklawren
requested changes
Apr 6, 2026
Collaborator
dklawren
left a comment
There was a problem hiding this comment.
This looks good so far and thanks for the help.
Two issues:
Please also update .github/workflows/deploy.yml to use the same cleanup actions where appropriate.
Also Dockerfile and extensions/BMO/Extension.pm use the CIRCLE_* variables to populate values in version.json in install_filesystem(). These will need to be update to use GITHUB_* equivalent variables and values.
For example in the Dockerfile:
ARG GITHUB_SHA
ARG GITHUB_SERVER_URL
ARG GITHUB_RUN_ID
ENV GITHUB_SHA=${GITHUB_SHA}
ENV GITHUB_RUN_URL=${GITHUB_SERVER_URL}/mozilla-bteam/bmo/actions/runs/${GITHUB_RUN_ID}
And then update Extension.pm to read the new variable names.
…_* vars - deploy.yml: remove docker-compose install step, use 'docker compose' v2, update action versions (setup-buildx@v3, login@v3, build-push@v6), pass GITHUB_* build-args to Docker build - Dockerfile: add GITHUB_SHA, GITHUB_SERVER_URL, GITHUB_RUN_ID ARGs and construct GITHUB_RUN_URL env var - Extension.pm: replace CIRCLE_SHA1/CIRCLE_BUILD_URL with GITHUB_SHA/GITHUB_RUN_URL for version.json Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
Author
|
@dklawren Addressed, thanks! |
dklawren
approved these changes
Apr 13, 2026
Collaborator
|
Thanks! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Updates the GitHub Actions CI workflow and Dockerfile to remove deprecated tooling:
apt install docker-compose— GitHub Actions runners already include Docker Compose v2 as a plugin, so the install step is unnecessary overheaddocker-compose→docker compose— the hyphenated v1 (Python-based) tool is deprecated in favor of the v2 Go pluginCIRCLE_SHA1andCIRCLE_BUILD_URLare unused since CI moved to GitHub ActionsTesting: This PR's own CI run validates the changes — the updated
ci.ymlon this branch is what GitHub Actions will execute. Compose v2 compatibility verified locally withdocker compose -f docker-compose.test.yml config.