Skip to content

Replace CI bash loop with Makefile #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
loks0n merged 2 commits into from
May 14, 2026
Merged

Replace CI bash loop with Makefile #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53ce281
Add Makefile to drive templated builds, replace CI bash loop
loks0n May 14, 2026
0a2c301
Address PR feedback: derive versions list from filesystem, version-sc…
loks0n May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

- name: Build image
run: |
set -a
. ./versions/${{ matrix.php-versions }}.env
set +a
args=()
while IFS='=' read -r k _; do
[[ -z "$k" || "$k" =~ ^# ]] && continue
args+=(--build-arg "$k")
done < versions/${{ matrix.php-versions }}.env
docker image build "${args[@]}" --tag utopia-base-test .
run: make build VERSION=${{ matrix.php-versions }} IMAGE=utopia-base-test

- name: Save image
run: docker image save utopia-base-test -o image.tar
Expand Down
22 changes: 22 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
VERSION ?= 8.4
IMAGE ?= utopia-base-test:$(VERSION)
ENV_FILE := versions/$(VERSION).env

VERSIONS := $(patsubst versions/%.env,%,$(wildcard versions/*.env))

BUILD_ARGS = $(shell awk -F= '!/^\#/ && NF { printf "--build-arg %s ", $$1 }' $(ENV_FILE))

.PHONY: build test all clean

build:
set -a && . ./$(ENV_FILE) && set +a && \
docker build $(BUILD_ARGS) --tag $(IMAGE) .

test: build
container-structure-test test --image $(IMAGE) --config tests.yaml

all:
@for v in $(VERSIONS); do $(MAKE) build VERSION=$$v || exit $$?; done

clean:
@for v in $(VERSIONS); do docker rmi utopia-base-test:$$v 2>/dev/null || true; done
14 changes: 4 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,12 @@ All publishing workflows share a `build-<sha>` concurrency group so a release qu

## Local development

A single `Dockerfile` is templated by the per-version configs in `versions/<X.Y>.env`:
A single `Dockerfile` is templated by the per-version configs in `versions/<X.Y>.env`. Use the `Makefile`:

```sh
set -a && . versions/8.4.env && set +a
args=()
while IFS='=' read -r k _; do
[[ -z "$k" || "$k" =~ ^# ]] && continue
args+=(--build-arg "$k")
done < versions/8.4.env

docker build "${args[@]}" -t utopia-base-test .
container-structure-test test --image utopia-base-test --config tests.yaml
make build VERSION=8.4 # build a single version
make test VERSION=8.4 # build + run structure tests
make all # build all supported versions
```

To bump an extension version, edit the relevant `versions/<X.Y>.env`. To add a new PHP version, drop in a new `versions/<X.Y>.env` and add the version to the matrix in `.github/workflows/ci.yml` and `publish.yml`.
Loading