Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **setup-env retries uv install on transient GitHub Releases download failures** ([#407](https://github.com/vig-os/devcontainer/issues/407))
- Add `continue-on-error` plus a delayed second attempt for `astral-sh/setup-uv` in `.github/actions/setup-env/action.yml`
- Reduce flaky release publish failures when GitHub CDN returns transient HTTP errors for uv release assets
- **Smoke-test deploy keeps workspace scaffold as root CHANGELOG** ([#403](https://github.com/vig-os/devcontainer/issues/403))
- Stop overwriting `CHANGELOG.md` with a minimal stub in `assets/smoke-test/.github/workflows/repository-dispatch.yml`
- Require the workspace `CHANGELOG.md` from `init-workspace` so downstream `prepare-release` validation matches shipped layout
- When the first changelog section is `## [X.Y.Z] - …` (TBD or a release date), remap that top version header to `## Unreleased` so downstream `prepare-release` can run

### Security

Expand Down
30 changes: 21 additions & 9 deletions assets/smoke-test/.github/workflows/repository-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ jobs:
if [ -e "CHANGELOG.md" ] && [ ! -w "CHANGELOG.md" ]; then
NEEDS_CHOWN=true
fi
if [ -e "CHANGELOG.md" ] && [ ! -r "CHANGELOG.md" ]; then
NEEDS_CHOWN=true
fi

if [ "${NEEDS_CHOWN}" = "true" ]; then
OWNER_UID_GID="$(id -u):$(id -g)"
Expand All @@ -229,15 +232,24 @@ jobs:
echo "ERROR: .devcontainer/CHANGELOG.md is not readable after ownership repair"
exit 1
fi
cat > "CHANGELOG.md" <<CHLOG
# Changelog

## Unreleased

### Changed

- Deploy devcontainer ${TAG}
CHLOG
if [ ! -f "CHANGELOG.md" ]; then
echo "ERROR: expected CHANGELOG.md after install (workspace scaffold)"
exit 1
fi
if [ ! -r "CHANGELOG.md" ]; then
echo "ERROR: CHANGELOG.md is not readable after ownership repair"
exit 1
fi
FIRST_CHANGELOG_SECTION="$(awk '/^## / { print; exit }' CHANGELOG.md)"
if [ "${FIRST_CHANGELOG_SECTION}" = "## Unreleased" ]; then
:
elif printf '%s\n' "${FIRST_CHANGELOG_SECTION}" | grep -Eq '^## \[[^]]+\] - '; then
echo "Remapping top ## [version] - <date> to ## Unreleased for prepare-release"
sed -i '0,/^## \[[^]]*\] - /s/^## \[[^]]*\] - .*/## Unreleased/' CHANGELOG.md
else
echo "ERROR: CHANGELOG.md first section is neither ## Unreleased nor ## [version] - <date>: ${FIRST_CHANGELOG_SECTION:-<empty>}"
exit 1
fi

- name: Prepare deploy branch and metadata
id: prepare_branch
Expand Down
4 changes: 4 additions & 0 deletions assets/workspace/.devcontainer/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **setup-env retries uv install on transient GitHub Releases download failures** ([#407](https://github.com/vig-os/devcontainer/issues/407))
- Add `continue-on-error` plus a delayed second attempt for `astral-sh/setup-uv` in `.github/actions/setup-env/action.yml`
- Reduce flaky release publish failures when GitHub CDN returns transient HTTP errors for uv release assets
- **Smoke-test deploy keeps workspace scaffold as root CHANGELOG** ([#403](https://github.com/vig-os/devcontainer/issues/403))
- Stop overwriting `CHANGELOG.md` with a minimal stub in `assets/smoke-test/.github/workflows/repository-dispatch.yml`
- Require the workspace `CHANGELOG.md` from `init-workspace` so downstream `prepare-release` validation matches shipped layout
- When the first changelog section is `## [X.Y.Z] - …` (TBD or a release date), remap that top version header to `## Unreleased` so downstream `prepare-release` can run

### Security

Expand Down
4 changes: 2 additions & 2 deletions tests/bats/just.bats
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ setup() {
assert_success
}

@test "smoke-test dispatch generates minimal changelog for prepare-release freeze" {
run bash -lc 'grep -Fq -- "cat > \"CHANGELOG.md\" <<CHLOG" assets/smoke-test/.github/workflows/repository-dispatch.yml && grep -Fq -- "## Unreleased" assets/smoke-test/.github/workflows/repository-dispatch.yml && grep -Fq -- "- Deploy devcontainer \${TAG}" assets/smoke-test/.github/workflows/repository-dispatch.yml'
@test "smoke-test dispatch normalizes workspace changelog for prepare-release freeze" {
run bash -lc 'grep -Fq -- "expected CHANGELOG.md after install (workspace scaffold)" assets/smoke-test/.github/workflows/repository-dispatch.yml && grep -Fq -- "FIRST_CHANGELOG_SECTION" assets/smoke-test/.github/workflows/repository-dispatch.yml && grep -Fq -- "## Unreleased" assets/smoke-test/.github/workflows/repository-dispatch.yml'
assert_success
}

Expand Down
Loading