Affected Branch
trunk
Basic Diagnostics
Description
On commits 210 and 211, all the 7/7 checks passed but docker merge failed after the commits were merged into trunk. We should never have this happen. Commit 212 resolved it for the time being, but we want to future-proof this.
Our docker pre-merge checks need to have equivalent steps to the docker merge stage to avoid unexpected failures after merge takes place. The docker-pull stage lags docker-merge.
We can see results of the docker merge github workflow on a push to our local branch. It can be replicated - adding an additional check to the 7 standard checks - by adding the last three lines below to .github/workflows/docker-merge.yml
on:
push:
branches:
- 'trunk'
pull-request:
branches:
- 'trunk'To test github workflows install act and run act --list and then
act -j docker-build --container-architecture linux/amd64
cc discussion with @HalosGhost + @maurermi
Code of Conduct
Affected Branch
trunk
Basic Diagnostics
I've pulled the latest changes on the affected branch and the issue is still present.
The issue is reproducible in docker
Description
On commits 210 and 211, all the 7/7 checks passed but docker merge failed after the commits were merged into trunk. We should never have this happen. Commit 212 resolved it for the time being, but we want to future-proof this.
Our docker pre-merge checks need to have equivalent steps to the docker merge stage to avoid unexpected failures after merge takes place. The
docker-pullstage lagsdocker-merge.We can see results of the docker merge github workflow on a push to our local branch. It can be replicated - adding an additional check to the 7 standard checks - by adding the last three lines below to
.github/workflows/docker-merge.ymlTo test github workflows install
actand runact --listand thenact -j docker-build --container-architecture linux/amd64cc discussion with @HalosGhost + @maurermi
Code of Conduct