From 4f41a569dde1fdc77845ffa314317f7dbdb12c62 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Sat, 25 Nov 2023 00:27:52 -0700 Subject: [PATCH] Replace development with main The development branch has been replaced with the main branch in GitHub. Replaces references to development in docs, commands, configuration, and workflows. Signed-off-by: Jonathon Anderson --- .github/PULL_REQUEST_TEMPLATE.md | 10 +++++----- .github/dependabot.yml | 2 +- .github/workflows/check.yml | 2 -- .github/workflows/documentation.yml | 2 -- internal/app/wwctl/overlay/edit/main.go | 2 +- userdocs/conf.py | 4 ++-- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7d13a4fe..599990bf 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -13,8 +13,8 @@ fixing or enhancing. ## Before submitting a PR, make sure you have done the following: - [ ] Signed off on all commits (e.g., using `git commit --signoff`) in agreement to the [DCO](DCO.txt) -- [ ] Read the [documentation for contributing to Warewulf](https://warewulf.org/docs/development/contributing/contributing.html) -- [ ] Added changes to the [CHANGELOG](https://github.com/hpcng/warewulf/blob/development/CHANGELOG.md) if necessary -- [ ] Updated [userdocs](https://github.com/hpcng/warewulf/tree/development/userdocs) if necessary -- [ ] Based this PR against the appropriate branch (typically [development](https://github.com/hpcng/warewulf/tree/development/userdocs)) -- [ ] Added myself as a contributor to the [Contributors File](https://github.com/hpcng/warewulf/blob/development/CONTRIBUTORS.md) +- [ ] Read the [documentation for contributing to Warewulf](https://warewulf.org/docs/main/contributing/contributing.html) +- [ ] Added changes to the [CHANGELOG](https://github.com/hpcng/warewulf/blob/main/CHANGELOG.md) if necessary +- [ ] Updated [userdocs](https://github.com/hpcng/warewulf/tree/main/userdocs) if necessary +- [ ] Based this PR against the appropriate branch (typically [main](https://github.com/hpcng/warewulf/tree/main/userdocs)) +- [ ] Added myself as a contributor to the [Contributors File](https://github.com/hpcng/warewulf/blob/main/CONTRIBUTORS.md) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 886e7304..eb651d1b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,4 +9,4 @@ updates: directory: "/" # Location of package manifests schedule: interval: "daily" - target-branch: development + target-branch: main diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 0eb19693..e0f9223d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -5,13 +5,11 @@ on: push: branches: - main - - development paths-ignore: - 'docs/**' pull_request: branches: - main - - development paths-ignore: - 'docs/**' diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 999b4b48..08f7851a 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -5,14 +5,12 @@ on: push: branches: - main - - development - v4.*.x paths: - 'userdocs/**' pull_request: branches: - main - - development - v4.*.x paths: - 'userdocs/**' diff --git a/internal/app/wwctl/overlay/edit/main.go b/internal/app/wwctl/overlay/edit/main.go index 655aec3d..468f4248 100644 --- a/internal/app/wwctl/overlay/edit/main.go +++ b/internal/app/wwctl/overlay/edit/main.go @@ -24,7 +24,7 @@ const initialTemplate = `# This is a Warewulf Template file. # Network Config = {{.NetDevs.eth0.Ipaddr}}, {{.NetDevs.eth0.Hwaddr}}, etc. # # Go to the documentation pages for more information: -# https://warewulf.org/docs/development/contents/overlays.html +# https://warewulf.org/docs/main/contents/overlays.html # # Keep the following for better reference: # --- diff --git a/userdocs/conf.py b/userdocs/conf.py index 3420cbe6..b03f4737 100644 --- a/userdocs/conf.py +++ b/userdocs/conf.py @@ -9,7 +9,7 @@ project = 'Warewulf User Guide' copyright = '2023, Warewulf Project Contributors' author = 'Warewulf Project Contributors' -release = 'development' +release = 'main' # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration @@ -39,7 +39,7 @@ html_context = { 'display_github': True, 'github_user': 'hpcng', 'github_repo': 'warewulf', - 'github_version': 'development', + 'github_version': 'main', 'conf_py_path': '/userdocs/', }