From 970cd1cfbb4760770def05c248f3351aae3aec6a Mon Sep 17 00:00:00 2001 From: David Humphreys Date: Fri, 20 Nov 2026 00:49:05 +0000 Subject: [PATCH] Workflows and docs: main is the default branch and development the working branch --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 4 ++-- CLAUDE.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85fc45c..69e22e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: pull_request: - branches: [master, dev] + branches: [main, development] workflow_dispatch: permissions: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7f4228..0eedcc5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -# Release: on every push to master, builds Release and pushes the +# Release: on every push to main, builds Release and pushes the # DSoft.WizardControl.* packages to nuget.org as 3.1.yyMM., then tags the # commit and creates a GitHub release with the packages attached. # RELEASE_SUFFIX is empty for a stable version; set it to a suffix such as @@ -8,7 +8,7 @@ name: Release on: push: - branches: [master] + branches: [main] paths-ignore: - '**.md' - '.github/workflows/**' diff --git a/CLAUDE.md b/CLAUDE.md index 5db94e2..5d672ce 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -60,9 +60,9 @@ Applies to all projects: documentation XML generation, `GeneratePackageOnBuild`, ## Versioning & CI -- GitHub Actions (`.github/workflows/`) on `windows-latest` with the .NET 10 and .NET 11 SDKs. `ci.yml` builds Release for pull requests into `master` and `dev` and publishes nothing. `release.yml` runs on every push to `master`, builds Release as `3.1..`, pushes the `DSoft.*` packages to nuget.org with Trusted Publishing (OIDC, `NUGET_USER` secret, `nuget` environment), then tags the commit and creates a GitHub release. +- GitHub Actions (`.github/workflows/`) on `windows-latest` with the .NET 10 and .NET 11 SDKs. `ci.yml` builds Release for pull requests into `main` and `development` and publishes nothing. `release.yml` runs on every push to `main`, builds Release as `3.1..`, pushes the `DSoft.*` packages to nuget.org with Trusted Publishing (OIDC, `NUGET_USER` secret, `nuget` environment), then tags the commit and creates a GitHub release. - Package versions are set per-project in the `.csproj` (``); CI overrides via `/p:Version=`. ## Git -`master` is the release/PR target; active work happens on `dev`. +`main` is the release branch; active work happens on `development`.