Skip to content

feat: full and full-dev get a third service, Notifications, by dotskit after the template made the first two #22

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
Vovanda merged 1 commit into from
Oct 6, 2026
Merged

feat: full and full-dev get a third service, Notifications, by dotskit after the template made the first two #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 29 additions & 3 deletions .samples/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ commit=""
hive=()
[ -n "${TEMPLATE_HIVE:-}" ] && hive=(--debug:custom-hive "$TEMPLATE_HIVE")

# A release carries the template's package and, from 2.8, its tool's; the template is installed from its own.
if gh release download "$tag" -R "$template_repo" -p '*.nupkg' -D "$work/package" 2>/dev/null; then
dotnet new install "$work"/package/*.nupkg --force "${hive[@]}"
dotnet new install "$work"/package/SawKing.DotNetSolutionKit.*.nupkg --force "${hive[@]}"
version="${tag#v}"
else
git clone -q --depth 1 --branch "$tag" "https://github.com/$template_repo.git" "$work/template"
Expand All @@ -50,10 +51,30 @@ cd "$out"
jq -r --arg b "$branch" --arg s "$since" '.[] | select(.branch == $b) | .generate[] | select(.since == $s) | .commands[]' \
"$here/variants.json" | tr -d '\r' > "$work/commands"
[ -s "$work/commands" ] || { echo "variants.json has no commands for $branch since $since" >&2; exit 1; }
# A command that starts with dotskit runs the template's tool of the same version: built from the sources of a
# branch, installed from nuget.org for a release. The folder is a fresh generation, not a team's git tree, so
# the tool writes without asking and without a clean tree.
dotskit_tool=""
dotskit() {
if [ -z "$dotskit_tool" ]; then
if [ -n "$commit" ]; then
dotnet build "$work/template/tool/DotsKit" -c Release -o "$work/tool" -nologo -v q > /dev/null
export DOTSKIT_TEMPLATE_SOURCE="$work/template/template"
dotskit_tool=(dotnet "$work/tool/dotskit.dll")
else
dotnet tool install SawKing.DotsKit.Tool --version "$version" --add-source "$work/package" --tool-path "$work/tool" > /dev/null
dotskit_tool=("$work/tool/dotskit")
fi
fi
"${dotskit_tool[@]}" "$@" --yes --allow-dirty
}
while read -r args; do
# Word splitting of the arguments is intended.
# shellcheck disable=SC2086
dotnet new DotNetSolutionKit $args "${hive[@]}"
case "$args" in
dotskit\ *) dotskit ${args#dotskit } < /dev/null ;;
*) dotnet new DotNetSolutionKit $args "${hive[@]}" ;;
esac
done < "$work/commands"
# Before 2.8 a service joined All.sln by this script; since, it adds itself, and there is no script.
[ ! -f src/services/manual-add-projects.sh ] || bash src/services/manual-add-projects.sh < /dev/null
Expand Down Expand Up @@ -94,8 +115,13 @@ legend() {
fi
echo
echo '```bash'
sed 's/^/dotnet new DotNetSolutionKit /' "$work/commands"
sed '/^dotskit /!s/^/dotnet new DotNetSolutionKit /' "$work/commands"
echo '```'
if grep -q '^dotskit ' "$work/commands"; then
echo
echo "dotskit is the template's tool, SawKing.DotsKit.Tool of the same version; it ran here with --yes and"
echo "--allow-dirty, as the folder was a fresh generation, not a git tree."
fi
echo
echo "Nothing here is edited by hand: the branch is replaced when the template moves on."
} > README.md
Expand Down
16 changes: 10 additions & 6 deletions .samples/variants.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
{
"branch": "full",
"about": "Every flag: the bus with an outbox, Infisical, feature flags, the API diff, access rules over a tenant tree, object storage, ClickHouse; two services.",
"about": "Every flag: the bus with an outbox, Infisical, feature flags, the API diff, access rules over a tenant tree, object storage, ClickHouse, MongoDB and email; three services, the third, Notifications, added by dotskit after the template made the first two.",
"generate": [
{
"since": "2.7.0",
Expand All @@ -39,8 +39,10 @@
{
"since": "2.8.0",
"commands": [
"-N ST -P DotNetSolutionKit.Samples -S Orders -M false --GitHubCiCd true --Messaging outbox -I true --DiffApi true --FeatureFlags true --HierarchyRules true --Storage true --ClickHouse true --MongoDB true --Notify email",
"-N ST -P DotNetSolutionKit.Samples -S Billing --Messaging outbox -I true --DiffApi true --FeatureFlags true --Storage true --ClickHouse true"
"-N ST -P DotNetSolutionKit.Samples -S Orders --Solution --GitHubCiCd true --Messaging outbox -I true --DiffApi true --FeatureFlags true --HierarchyRules true --Storage true --ClickHouse true --MongoDB true --allow-scripts yes",
"-N ST -P DotNetSolutionKit.Samples -S Billing --Messaging outbox -I true --DiffApi true --FeatureFlags true --Storage true --ClickHouse true --allow-scripts yes",
"dotskit init",
"dotskit new -S Notifications --Notify email --Messaging outbox"
]
}
],
Expand All @@ -62,13 +64,15 @@
{
"branch": "full-dev",
"ref": "dev",
"about": "The flags of full and the ones dev adds before a release, generated from the template's dev once a day when it has moved. A red CI here is a break in dev before a release.",
"about": "The flags of full and the ones dev adds before a release, generated from the template's dev once a day when it has moved. A red CI here is a break in dev before a release. Its third service, Notifications, is added by dotskit after the template made the first two.",
"generate": [
{
"since": "2.8.0",
"commands": [
"-N ST -P DotNetSolutionKit.Samples -S Orders -M false --GitHubCiCd true --Messaging outbox -I true --DiffApi true --FeatureFlags true --HierarchyRules true --Storage true --ClickHouse true --MongoDB true --Notify email",
"-N ST -P DotNetSolutionKit.Samples -S Billing --Messaging outbox -I true --DiffApi true --FeatureFlags true --Storage true --ClickHouse true"
"-N ST -P DotNetSolutionKit.Samples -S Orders --Solution --GitHubCiCd true --Messaging outbox -I true --DiffApi true --FeatureFlags true --HierarchyRules true --Storage true --ClickHouse true --MongoDB true --allow-scripts yes",
"-N ST -P DotNetSolutionKit.Samples -S Billing --Messaging outbox -I true --DiffApi true --FeatureFlags true --Storage true --ClickHouse true --allow-scripts yes",
"dotskit init",
"dotskit new -S Notifications --Notify email --Messaging outbox"
]
}
]
Expand Down