Compare commits
24
Commits
0.2.0
...
96dc1b7d09
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
96dc1b7d09 | ||
|
|
cfde2ed798 | ||
|
|
a24bace57a | ||
|
|
4d479f0166 | ||
|
|
b3fa891b89 | ||
|
|
98bbb7017f | ||
|
|
3b1e78ebf5 | ||
|
|
a8f5680e6e | ||
|
|
658892a639 | ||
|
|
06fc829ff1 | ||
|
|
30a2439914 | ||
|
|
222c8aaa85 | ||
|
|
47d9a62db7 | ||
|
|
0b1fed2f93 | ||
|
|
f3491ef4a6 | ||
|
|
d6a4f7c41f | ||
|
|
211edc4538 | ||
|
|
14b325b3bf | ||
|
|
d15e25abf3 | ||
|
|
53186e9a35 | ||
|
|
7688fd77c9 | ||
|
|
6e79337a60 | ||
|
|
68424aa28b | ||
|
|
fdc7fa700d |
@@ -19,6 +19,9 @@ on:
|
|||||||
required: true
|
required: true
|
||||||
type: string
|
type: string
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: git.arthurerlich.de
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-push:
|
build-push:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -40,12 +43,6 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
git checkout "refs/tags/${{ inputs.tag }}"
|
git checkout "refs/tags/${{ inputs.tag }}"
|
||||||
|
|
||||||
# Strip the protocol from the server URL to get the registry hostname.
|
|
||||||
# e.g. https://gitea.example.com → gitea.example.com
|
|
||||||
- name: Derive registry hostname
|
|
||||||
run: |
|
|
||||||
echo "REGISTRY=$(echo '${{ gitea.server_url }}' | sed 's|https://||;s|http://||')" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
# Generates OCI-compliant tags and labels from the provided release tag.
|
# Generates OCI-compliant tags and labels from the provided release tag.
|
||||||
# 1.2.3 → image tags: 1.2.3 / 1.2 / 1
|
# 1.2.3 → image tags: 1.2.3 / 1.2 / 1
|
||||||
- name: Extract Docker metadata
|
- name: Extract Docker metadata
|
||||||
@@ -73,17 +70,6 @@ jobs:
|
|||||||
username: ${{ gitea.actor }}
|
username: ${{ gitea.actor }}
|
||||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||||
|
|
||||||
# Build a single-arch image locally so Trivy can inspect it before the real push.
|
|
||||||
- name: Build local image for scanning
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
target: final
|
|
||||||
platforms: linux/amd64
|
|
||||||
load: true
|
|
||||||
tags: scan-target:${{ inputs.tag }}
|
|
||||||
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository }}:buildcache
|
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
# Cuts a release: moves CHANGELOG.md's [Unreleased] section under a new
|
||||||
|
# version heading, commits it to main, then creates and pushes the version tag.
|
||||||
|
# Trigger manually via workflow_dispatch, entering the semver to release.
|
||||||
|
# The pushed tag can then be built with docker-publish.yml.
|
||||||
|
|
||||||
|
name: Create Release Tag
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
version:
|
||||||
|
description: "Version to release (semver, e.g. 1.2.3)"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
tag:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Validate version and Unreleased section
|
||||||
|
run: |
|
||||||
|
if ! [[ "${{ inputs.version }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||||
|
echo "Error: '${{ inputs.version }}' is not a valid semver (e.g. 1.2.3)."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if git rev-parse "refs/tags/${{ inputs.version }}" >/dev/null 2>&1; then
|
||||||
|
echo "Error: tag '${{ inputs.version }}' already exists."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
awk '/^## \[Unreleased\]/{f=1;next}/^## \[/{f=0}f' CHANGELOG.md > /tmp/unreleased.md
|
||||||
|
if ! grep -q '[^[:space:]]' /tmp/unreleased.md; then
|
||||||
|
echo "Error: CHANGELOG.md's [Unreleased] section is empty — nothing to release."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Move Unreleased entries under the new version heading
|
||||||
|
run: |
|
||||||
|
today=$(date +%Y-%m-%d)
|
||||||
|
awk -v ver="${{ inputs.version }}" -v date="$today" '
|
||||||
|
/^## \[Unreleased\]/ { print; print ""; print "## [" ver "] - " date; next }
|
||||||
|
{ print }
|
||||||
|
' CHANGELOG.md > /tmp/CHANGELOG.md
|
||||||
|
mv /tmp/CHANGELOG.md CHANGELOG.md
|
||||||
|
|
||||||
|
- name: Commit and tag
|
||||||
|
run: |
|
||||||
|
git config user.name "gitea-actions"
|
||||||
|
git config user.email "actions@noreply.git.arthurerlich.de"
|
||||||
|
git add CHANGELOG.md
|
||||||
|
git commit -m "chore(release): ${{ inputs.version }}"
|
||||||
|
git tag "${{ inputs.version }}"
|
||||||
|
git push origin HEAD:main
|
||||||
|
git push origin "${{ inputs.version }}"
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
name: Tests
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
pull_request:
|
||||||
|
branches: [main]
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: git.arthurerlich.de
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-dev:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Log in to Gitea registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ${{ env.REGISTRY }}
|
||||||
|
username: ${{ gitea.actor }}
|
||||||
|
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||||
|
|
||||||
|
- name: Build dev image (PHP 8.4 + composer deps)
|
||||||
|
uses: docker/build-push-action@v5
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
file: Dockerfile.dev
|
||||||
|
target: dev
|
||||||
|
load: true
|
||||||
|
tags: graph-dev:ci
|
||||||
|
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository }}:buildcache-dev
|
||||||
|
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository }}:buildcache-dev,mode=max
|
||||||
|
|
||||||
|
- name: Run tests in dev image
|
||||||
|
run: |
|
||||||
|
cid=$(docker create graph-dev:ci sh -c "
|
||||||
|
composer install --no-interaction &&
|
||||||
|
vendor/bin/phpunit --testdox &&
|
||||||
|
composer phpstan
|
||||||
|
")
|
||||||
|
docker cp . "$cid":/app
|
||||||
|
rc=0
|
||||||
|
docker start -a "$cid" || rc=$?
|
||||||
|
docker rm "$cid" > /dev/null
|
||||||
|
exit $rc
|
||||||
|
|
||||||
|
build-prod:
|
||||||
|
needs: build-dev
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Log in to Gitea registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ${{ env.REGISTRY }}
|
||||||
|
username: ${{ gitea.actor }}
|
||||||
|
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||||
|
|
||||||
|
- name: Build prod image (final target)
|
||||||
|
uses: docker/build-push-action@v5
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
file: Dockerfile
|
||||||
|
target: final
|
||||||
|
push: false
|
||||||
|
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository }}:buildcache-prod
|
||||||
|
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository }}:buildcache-prod,mode=max
|
||||||
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Removed a leftover `composer dump-env prod` call in the prod Docker build stage — the command doesn't exist in this project's Composer setup and broke every image build
|
||||||
|
|
||||||
## [0.2.0] - 2026-07-12
|
## [0.2.0] - 2026-07-12
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -138,12 +138,29 @@ Workflow files live in [.gitea/workflows/](.gitea/workflows/). This project uses
|
|||||||
- Secrets are set under Repository → Settings → Secrets → Actions
|
- Secrets are set under Repository → Settings → Secrets → Actions
|
||||||
- The registry hostname must be derived from `gitea.server_url` (strip the protocol prefix)
|
- The registry hostname must be derived from `gitea.server_url` (strip the protocol prefix)
|
||||||
- Triggers use standard `on:` syntax; `tags: '*.*.*'` matches semver pushes without a `v` prefix
|
- Triggers use standard `on:` syntax; `tags: '*.*.*'` matches semver pushes without a `v` prefix
|
||||||
|
- Do not use `cache-from/cache-to: type=gha` — on this instance's act_runner (v2.0.0), the internal GitHub Actions-cache-compatible proxy is not reachable from job containers (`dial tcp <ip>:<port>: i/o timeout`), a known act_runner docker-executor networking limitation, not a workflow bug. Use `type=registry` instead (push cache blobs to `${{ env.REGISTRY }}/<repo>:buildcache*` — see both `test.yml` and `docker-publish.yml`); it requires a registry login step even for jobs that don't push the final image.
|
||||||
|
|
||||||
**Current workflows:**
|
**Current workflows:**
|
||||||
|
|
||||||
| File | Trigger | Purpose |
|
| File | Trigger | Purpose |
|
||||||
| -------------------- | ---------------- | --------------------------------------------------------- |
|
| -------------------- | ---------------- | --------------------------------------------------------- |
|
||||||
| `docker-publish.yml` | Push tag `*.*.*` | Build & push multi-arch image to Gitea container registry |
|
| `docker-publish.yml` | Push tag `*.*.*` | Build & push multi-arch image to Gitea container registry |
|
||||||
|
| `test.yml` | Push/PR to `main`| Build dev+prod images, run PHPUnit and PHPStan |
|
||||||
|
|
||||||
|
### Release testing with `act`
|
||||||
|
|
||||||
|
Before tagging a release (anything that would trigger `docker-publish.yml`), run `test.yml` locally with [`act`](https://github.com/nektos/act) to catch pipeline failures before pushing. `test.yml` uses plain GitHub Actions syntax (no `gitea.*` contexts), so it runs under `act` unmodified.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
act -j test \
|
||||||
|
-P ubuntu-latest=catthehacker/ubuntu:act-latest \
|
||||||
|
--artifact-server-path /tmp/act-artifacts
|
||||||
|
```
|
||||||
|
|
||||||
|
- `-P ubuntu-latest=catthehacker/ubuntu:act-latest` — default act runner image lacks a Docker CLI, which the `test` job needs for its nested `docker run` steps
|
||||||
|
- `--artifact-server-path` — required for the `upload-artifact`/`download-artifact` steps to work; without it they silently no-op
|
||||||
|
|
||||||
|
**If `act` is not installed:** warn the user it's missing and how to install it (`sudo pacman -S act`, or see the repo above) — do not install it yourself or force the check. `docker-publish.yml` is out of scope for `act` (it needs real `gitea.*` context and a live registry secret); don't try to run it locally.
|
||||||
|
|
||||||
## Docker
|
## Docker
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -30,8 +30,7 @@ FROM deps AS build
|
|||||||
COPY . .
|
COPY . .
|
||||||
RUN composer dump-autoload --classmap-authoritative --no-dev --no-interaction && \
|
RUN composer dump-autoload --classmap-authoritative --no-dev --no-interaction && \
|
||||||
mkdir -p var/cache var/log && \
|
mkdir -p var/cache var/log && \
|
||||||
APP_ENV=prod APP_SECRET=placeholder php bin/console cache:warmup --no-debug && \
|
APP_ENV=prod APP_SECRET=placeholder php bin/console cache:warmup --no-debug
|
||||||
composer dump-env prod
|
|
||||||
|
|
||||||
# ── final (prod) stage — no composer binary ────────────────────────────────────
|
# ── final (prod) stage — no composer binary ────────────────────────────────────
|
||||||
FROM base AS final
|
FROM base AS final
|
||||||
|
|||||||
Generated
+4
-4
@@ -3322,11 +3322,11 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpstan/phpstan",
|
"name": "phpstan/phpstan",
|
||||||
"version": "2.2.5",
|
"version": "2.2.7",
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/909c1e5fef7989ac0d0c1c5c42e32a5c4f6198a0",
|
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/692db47b9dddb0487934e5236e77d48594aef921",
|
||||||
"reference": "909c1e5fef7989ac0d0c1c5c42e32a5c4f6198a0",
|
"reference": "692db47b9dddb0487934e5236e77d48594aef921",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -3382,7 +3382,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-07-05T06:31:06+00:00"
|
"time": "2026-07-29T17:39:32+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-code-coverage",
|
"name": "phpunit/php-code-coverage",
|
||||||
|
|||||||
Reference in New Issue
Block a user