From 7aacbc4891b323a7aee8f97c9ce3fe8eacea57e1 Mon Sep 17 00:00:00 2001 From: Norman Abramovitz Date: Thu, 2 Jul 2026 04:52:52 -0700 Subject: [PATCH 1/2] chore: retarget master branch refs to main (#5507) Prepares for the master -> main release-branch rename: - workflow triggers (pr, stb_tests, backend_tests, frontend_tests, documentation) now target main - console-sync-release pipeline + secrets sample branch refs - Chart.yaml icon raw URL (raw URLs do not redirect on rename) - package.json climate script diff base - .travis.yml branch allowlist (v2-master left as-is) - docs: release_guide, contributing guides, developer-environment, devops_guide, cf-api-v2-usage, README license badge - CONTRIBUTING.md: corrected stale claim that PRs target master (they target develop; main is the release branch) Other projects' master URLs (helm, gimme, mo, mariadb, angular-cli, monocular) and historical CHANGELOG entries are untouched. --- .github/workflows/backend_tests.yml | 2 +- .github/workflows/documentation.yml | 4 ++-- .github/workflows/frontend_tests.yml | 2 +- .github/workflows/pr.yml | 4 ++-- .github/workflows/stb_tests.yml | 4 ++-- .travis.yml | 2 +- CONTRIBUTING.md | 6 +++--- README.md | 2 +- deploy/ci/console-sync-release.yml | 2 +- deploy/ci/secrets.yml-sample | 4 ++-- deploy/kubernetes/console/Chart.yaml | 2 +- docs/cf-api-v2-usage.md | 2 +- docs/contributing_guide.md | 2 +- docs/developer-environment.md | 4 ++-- docs/devops_guide.md | 2 +- docs/release_guide.md | 22 +++++++++++----------- package.json | 2 +- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/backend_tests.yml b/.github/workflows/backend_tests.yml index f928094fc9..87508a690b 100644 --- a/.github/workflows/backend_tests.yml +++ b/.github/workflows/backend_tests.yml @@ -4,7 +4,7 @@ on: push: branches: - develop - - master + - main # tools/stb has its own gate (stb_tests.yml); skip the backend suite # for stb-only changes. paths-ignore: diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 190651dc0b..c3774eae3e 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -2,9 +2,9 @@ name: documentation on: pull_request: - branches: [master] + branches: [main] push: - branches: [master] + branches: [main] env: FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: 'true' diff --git a/.github/workflows/frontend_tests.yml b/.github/workflows/frontend_tests.yml index 947a42be5f..e779550fc8 100644 --- a/.github/workflows/frontend_tests.yml +++ b/.github/workflows/frontend_tests.yml @@ -4,7 +4,7 @@ on: push: branches: - develop - - master + - main # tools/stb has its own gate (stb_tests.yml); skip the frontend suite # for stb-only changes. paths-ignore: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 807109b371..49bf4f343a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,13 +10,13 @@ name: Pull Request Tests on: pull_request: branches: - - master + - main - develop - 'angular**' push: branches: - develop - - master + - main env: NODE_OPTIONS: --max-old-space-size=5500 diff --git a/.github/workflows/stb_tests.yml b/.github/workflows/stb_tests.yml index c3afbeb840..0db88fbc48 100644 --- a/.github/workflows/stb_tests.yml +++ b/.github/workflows/stb_tests.yml @@ -16,13 +16,13 @@ name: STB Tests on: pull_request: branches: - - master + - main - develop - 'angular**' push: branches: - develop - - master + - main paths: - 'tools/stb/**' diff --git a/.travis.yml b/.travis.yml index 63b6b9f46c..240d16135b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ install: filter_secrets: false branches: only: - - master + - main - v2-master - e2e-tests cache: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6d081d6326..29e81c5b1e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ To send your code change, use GitHub pull requests. The workflow is as follows: 1. Fork the project. - 1. Create a branch based on `master`. + 1. Create a branch based on `develop`. 1. Implement your change, including tests and documentation. @@ -66,8 +66,8 @@ pointing to the number of the issue (e.g. "Fixes #123"). ### Pull requests and branches -All work happens in branches. The master branch is only used as the target for pull -requests. +All work happens in branches. The develop branch is the target for pull +requests; releases are cut from main. During code review you often need to update pull requests. Usually you do that by pushing additional commits. diff --git a/README.md b/README.md index 89c8ff0b21..af44655f90 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![GitHub release](https://img.shields.io/github/release/cloudfoundry-community/stratos.svg)](https://github.com/cloudfoundry/stratos/releases/latest) -[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/cloudfoundry/stratos/blob/master/LICENSE) +[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/cloudfoundry/stratos/blob/main/LICENSE) [![slack.cloudfoundry.org](https://slack.cloudfoundry.org/badge.svg)](https://cloudfoundry.slack.com/messages/C80EP4Y57/) # Roadmap diff --git a/deploy/ci/console-sync-release.yml b/deploy/ci/console-sync-release.yml index fa72e3bf46..3e7d6397f0 100644 --- a/deploy/ci/console-sync-release.yml +++ b/deploy/ci/console-sync-release.yml @@ -8,7 +8,7 @@ resources: - name: helm-charts-repository type: git source: - branch: master + branch: main private_key: {{github-private-key}} uri: {{release-helm-repo}} jobs: diff --git a/deploy/ci/secrets.yml-sample b/deploy/ci/secrets.yml-sample index 1bc457ab8a..e772a75dc1 100644 --- a/deploy/ci/secrets.yml-sample +++ b/deploy/ci/secrets.yml-sample @@ -1,6 +1,6 @@ # Branches -stratos-deploy-branch: master -stratos-ui-branch: master +stratos-deploy-branch: main +stratos-ui-branch: main ui-pr-label: my-pr-label # Images diff --git a/deploy/kubernetes/console/Chart.yaml b/deploy/kubernetes/console/Chart.yaml index aaea5f78e9..150944d9eb 100644 --- a/deploy/kubernetes/console/Chart.yaml +++ b/deploy/kubernetes/console/Chart.yaml @@ -5,7 +5,7 @@ version: 0.1.0 appVersion: 0.1.0 sources: - https://github.com/cloudfoundry/stratos -icon: https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/console/icon.png +icon: https://raw.githubusercontent.com/cloudfoundry/stratos/main/deploy/kubernetes/console/icon.png home: https://stratos.app maintainers: - name: Stratos Maintainers diff --git a/docs/cf-api-v2-usage.md b/docs/cf-api-v2-usage.md index fc99d7d0f5..8aeaa6ae5f 100644 --- a/docs/cf-api-v2-usage.md +++ b/docs/cf-api-v2-usage.md @@ -772,7 +772,7 @@ Endpoint | Inline Relations | Notes #### Others The include-relations property is populated by walking our relationship tree, so for a complete and exhaustive list of all possible -relations please see the [`entity-factory.ts`](https://github.com/cloudfoundry/stratos/blob/master/src/frontend/app/store/helpers/entity-factory.ts). +relations please see the [`entity-factory.ts`](https://github.com/cloudfoundry/stratos/blob/main/src/frontend/app/store/helpers/entity-factory.ts). In terms of api requests we also make use of... diff --git a/docs/contributing_guide.md b/docs/contributing_guide.md index 51faa7d70a..1d62c2482d 100644 --- a/docs/contributing_guide.md +++ b/docs/contributing_guide.md @@ -96,7 +96,7 @@ Browse [open issues](https://github.com/cloudfoundry/stratos/issues): ### 2. Create a Feature Branch All changes go to feature branches off `develop`. Never push directly to -`develop` or `master`. +`develop` or `main`. ```bash git checkout develop diff --git a/docs/developer-environment.md b/docs/developer-environment.md index 6cd5037b36..0c343745d5 100644 --- a/docs/developer-environment.md +++ b/docs/developer-environment.md @@ -185,8 +185,8 @@ GitHub Actions workflows: | Workflow | File | Trigger | |----------|------|---------| -| Frontend tests | `.github/workflows/frontend_tests.yml` | Push/PR to develop/master | -| Backend tests | `.github/workflows/backend_tests.yml` | Push/PR to develop/master | +| Frontend tests | `.github/workflows/frontend_tests.yml` | Push/PR to develop/main | +| Backend tests | `.github/workflows/backend_tests.yml` | Push/PR to develop/main | | Docker builds | `.github/workflows/docker.yml` | Release + manual dispatch | ### Known CI Drift diff --git a/docs/devops_guide.md b/docs/devops_guide.md index 3c43457d6c..dd2eaa2b52 100644 --- a/docs/devops_guide.md +++ b/docs/devops_guide.md @@ -882,7 +882,7 @@ kubectl -n stratos run -it --rm debug --image=curlimages/curl --restart=Never -- ### Documentation - [Official Docs](https://stratos.app/docs) -- [Helm Chart](https://github.com/cloudfoundry/stratos/tree/master/deploy/kubernetes) +- [Helm Chart](https://github.com/cloudfoundry/stratos/tree/main/deploy/kubernetes) - [Troubleshooting Guide](deploy/troubleshooting.md) ### Community diff --git a/docs/release_guide.md b/docs/release_guide.md index 931e08a268..df6ecc5906 100644 --- a/docs/release_guide.md +++ b/docs/release_guide.md @@ -48,7 +48,7 @@ That's it! GitHub Actions handles everything else. ### Code Quality -- [ ] All tests passing on develop/master branch +- [ ] All tests passing on develop/main branch - [ ] No open critical bugs or blockers - [ ] All planned features merged - [ ] Code freeze announced (if applicable) @@ -57,8 +57,8 @@ That's it! GitHub Actions handles everything else. **Verify:** ```bash # Check branch status -git checkout master -git pull origin master +git checkout main +git pull origin main git status # Run the full quality gate (lint + unit tests) @@ -113,7 +113,7 @@ make release cf FINAL=strip # Commit version bump (both files are updated automatically) git add package.json src/jetstream/VERSION git commit -m "chore: bump version to v5.0.0" -git push origin master +git push origin main ``` Every `make bump` automatically appends `+build.YYYYMMDD.SHORT-SHA` build @@ -252,9 +252,9 @@ git push origin v5.0.0-rc.2 **Process:** ```bash -# 1. Create hotfix branch from master -git checkout master -git pull origin master +# 1. Create hotfix branch from main +git checkout main +git pull origin main git checkout -b hotfix/5.0.1 # 2. Apply fix @@ -262,8 +262,8 @@ git checkout -b hotfix/5.0.1 make test git commit -am "fix: critical security issue" -# 3. Merge to master -git checkout master +# 3. Merge to main +git checkout main git merge hotfix/5.0.1 # 4. Bump patch version @@ -276,7 +276,7 @@ Critical security fix for authentication bypass. All users should upgrade immediately." # 6. Push -git push origin master v5.0.1 +git push origin main v5.0.1 ``` **Timeline:** ~15 minutes @@ -738,7 +738,7 @@ All users should upgrade immediately. Details: https://github.com/cloudfoundry/stratos/security/advisories/GHSA-XXXX" # 3. Push at coordinated time -git push origin master v5.0.1 +git push origin main v5.0.1 # 4. Publish security advisory gh advisory create diff --git a/package.json b/package.json index 320f147a39..930da179db 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "e2e:screenshot:v4": "E2E_BASE_URL=https://console481.run.adepttech.ca E2E_PROFILE=adepttech STRATOS_SCREENSHOT_LABEL=v4 playwright test e2e/tests/core/screenshots.spec.ts", "e2e:screenshot:v5": "E2E_BASE_URL=https://console.run.adepttech.ca E2E_PROFILE=adepttech STRATOS_SCREENSHOT_LABEL=v5 playwright test e2e/tests/core/screenshots.spec.ts", "e2e:screenshot:compare": "bunx tsx e2e/scripts/compare-screenshots.ts v4 v5", - "climate": "codeclimate analyze $(git diff --name-only master)", + "climate": "codeclimate analyze $(git diff --name-only main)", "gate-check": "bun run lint && bun run test && bun run build", "store-git-metadata": "sh -c 'mv build/store-git-metadata.js build/store-git-metadata.cjs 2>/dev/null || true && node build/store-git-metadata.cjs && mv build/store-git-metadata.cjs build/store-git-metadata.js 2>/dev/null || true'", "build-devkit": "cd src/frontend/packages/devkit && bun run build", From d1c675f2977e0d5229b205efb340dc22a2fb7c0d Mon Sep 17 00:00:00 2001 From: Norman Abramovitz Date: Thu, 2 Jul 2026 22:51:53 -0700 Subject: [PATCH 2/2] # chore: retarget master refs in newly merged docs The docs tree merged in #5547 arrived after this branch was cut and carries its own cloudfoundry/stratos tree/master and blob/master links. Same treatment as the rest of the branch; SUSE and third-party repo links are left alone. --- docs/developer/developers-guide-e2e-tests.md | 6 +++--- docs/extensions/disable-packages.md | 4 ++-- docs/extensions/introduction.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/developer/developers-guide-e2e-tests.md b/docs/developer/developers-guide-e2e-tests.md index 6e7b9d3ad6..a0c4414327 100644 --- a/docs/developer/developers-guide-e2e-tests.md +++ b/docs/developer/developers-guide-e2e-tests.md @@ -30,7 +30,7 @@ The tests require an instance of Cloud Foundry with the following: To meet the above requirements we recommend running the Stratos CF E2E set up script which is kept up to date with the latest test requirements. More information can be found [below](#running-the-e2e-set-up-script). -Before running the E2E tests, you need to create a file named `secrets.yaml` in the root of the Stratos folder. An example template is included in [e2e/secrets.yaml.example](https://github.com/cloudfoundry/stratos/blob/master/e2e/secrets.yaml.example) - copy this to `secrets.yaml` and edit accordingly. +Before running the E2E tests, you need to create a file named `secrets.yaml` in the root of the Stratos folder. An example template is included in [e2e/secrets.yaml.example](https://github.com/cloudfoundry/stratos/blob/main/e2e/secrets.yaml.example) - copy this to `secrets.yaml` and edit accordingly. If you want to run the tests in headless Chrome, add the following to the secrets file: @@ -39,7 +39,7 @@ headless: true ``` ## Running the E2E Set up Script -The script can be found in [deploy/tools/init-cf-for-e2e.sh](https://github.com/cloudfoundry/stratos/blob/master/deploy/tools/init-cf-for-e2e.sh) +The script can be found in [deploy/tools/init-cf-for-e2e.sh](https://github.com/cloudfoundry/stratos/blob/main/deploy/tools/init-cf-for-e2e.sh) ### Minimum Requirements - CF CLI @@ -111,7 +111,7 @@ Given the output of the script, the following template can be used to update the ### Tidying up test generated CF entities If tests are stopped before completing or fail to clean old test artifacts will exist in the CF. To clean some of these please see the script -at [deploy/ci/automation/e2e-clean-remnants.sh](https://github.com/cloudfoundry/stratos/blob/master/deploy/ci/automation/e2e-clean-remnants.sh) +at [deploy/ci/automation/e2e-clean-remnants.sh](https://github.com/cloudfoundry/stratos/blob/main/deploy/ci/automation/e2e-clean-remnants.sh) ## Running the tests diff --git a/docs/extensions/disable-packages.md b/docs/extensions/disable-packages.md index 6d2e2ddab0..9d494eb524 100644 --- a/docs/extensions/disable-packages.md +++ b/docs/extensions/disable-packages.md @@ -9,10 +9,10 @@ Frontend packages and their associated backend plugins can be removed at build t ## Frontend Package to Backend Plugin Dependencies Stratos NPM packages define a list of backend plugins that they require in order to function. These are found in the package's `package.json` in -the `stratos` section `backend` property. For instance the [Stratos Cloud Foundry](https://github.com/cloudfoundry/stratos/blob/master/src/frontend/packages/cloud-foundry/package.json) +the `stratos` section `backend` property. For instance the [Stratos Cloud Foundry](https://github.com/cloudfoundry/stratos/blob/main/src/frontend/packages/cloud-foundry/package.json) package depends on multiple backend plugins. -If a backend package is not referenced by a package that is built and is not in the 'default' plugins [list](https://github.com/cloudfoundry/stratos/blob/master/src/jetstream/default_plugins.go) +If a backend package is not referenced by a package that is built and is not in the 'default' plugins [list](https://github.com/cloudfoundry/stratos/blob/main/src/jetstream/default_plugins.go) then it will not be included in the backend build. Therefore omitting a frontend package will also most likely remove it's dependent plugins. > [!IMPORTANT] diff --git a/docs/extensions/introduction.md b/docs/extensions/introduction.md index 1c7d28f117..f14d0513d6 100644 --- a/docs/extensions/introduction.md +++ b/docs/extensions/introduction.md @@ -29,7 +29,7 @@ More information can be found in the [custom plugins page](./backend.md). ## Examples ### ACME -The ACME example contains a number of [theming](https://github.com/cloudfoundry/stratos/tree/master/src/frontend/packages/example-theme) and [functionality](https://github.com/cloudfoundry/stratos/tree/master/src/frontend/packages/example-extensions) customization. +The ACME example contains a number of [theming](https://github.com/cloudfoundry/stratos/tree/main/src/frontend/packages/example-theme) and [functionality](https://github.com/cloudfoundry/stratos/tree/main/src/frontend/packages/example-extensions) customization. To run Stratos with these customizations