Skip to content

Commit 00b4356

Browse files
committed
Updated codebase to correctly reference new default main branch.
1 parent 3042e22 commit 00b4356

35 files changed

Lines changed: 97 additions & 134 deletions

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ workflows:
683683
# - release/2023-04-17, release/2023-04-17.123 (date-based)
684684
# - hotfix/123.456.789, hotfix/123.456.789-rc.1213 (per https://semver.org/)
685685
# - hotfix/2023-04-17, hotfix/2023-04-17.123 (date-based)
686-
only: /^(production|main|master|develop|1.x|2.x)$|^project\/[a-zA-z0-9\-\.]+|^(feature|bugfix)\/[a-zA-Z0-9\-\.\,_]+$|^ci.*|^(release|hotfix)\/[0-9]+(\.[0-9]+){2}(-rc\.[0-9]+)?$|^(release|hotfix)\/[0-9]{4}-[0-9]{2}-[0-9]{2}(\.[0-9]+)?$/
686+
only: /^(production|main|master|develop)$|^project\/[a-zA-z0-9\-\.]+|^(feature|bugfix)\/[a-zA-Z0-9\-\.\,_]+$|^ci.*|^(release|hotfix)\/[0-9]+(\.[0-9]+){2}(-rc\.[0-9]+)?$|^(release|hotfix)\/[0-9]{4}-[0-9]{2}-[0-9]{2}(\.[0-9]+)?$/
687687
tags:
688688
ignore: /.*/
689689
- deploy-tags:

.github/workflows/build-test-deploy.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ on:
1515
- main
1616
- master
1717
- develop
18-
#;< VORTEX_DEV
19-
- 1.x
20-
- 2.x
21-
#;> VORTEX_DEV
2218
- release/**
2319
- hotfix/**
2420
- project/**
@@ -36,10 +32,6 @@ on:
3632
- main
3733
- master
3834
- develop
39-
#;< VORTEX_DEV
40-
- 1.x
41-
- 2.x
42-
#;> VORTEX_DEV
4335
- release/**
4436
- hotfix/**
4537
- project/**

.github/workflows/draft-release-notes.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ on:
77
branches:
88
- develop
99
#;< VORTEX_DEV
10-
- 1.x
11-
- 2.x
10+
- main
1211
#;> VORTEX_DEV
1312

1413
permissions:

.github/workflows/vortex-test-common.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ name: Vortex - Test
44
on:
55
push:
66
branches:
7-
- develop
8-
- 1.x
9-
- 2.x
7+
- main
108
pull_request:
119
branches:
12-
- develop
13-
- 1.x
14-
- 2.x
10+
- main
1511
- 'feature/**'
1612
- 'bugfix/**'
1713

.github/workflows/vortex-test-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
with:
8989
github-token: ${{ secrets.GITHUB_TOKEN }}
9090
publish-dir: '.vortex/docs/build'
91-
production-branch: 1.x
91+
production-branch: main
9292
deploy-message: "Deploy from GitHub Actions"
9393
enable-pull-request-comment: true
9494
enable-commit-comment: true

.github/workflows/vortex-test-installer.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ name: Vortex - Test installer
44
on:
55
push:
66
branches:
7-
- develop
8-
- 1.x
9-
- 2.x
7+
- main
108
pull_request:
119
branches:
12-
- develop
13-
- 1.x
14-
- 2.x
10+
- main
1511
- 'feature/**'
1612
- 'bugfix/**'
1713

.vortex/docs/content/README.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ curl -SsL https://www.vortextemplate.com/install > installer.php && php installe
162162
## ⚖️ License
163163

164164
**Vortex** is licensed under the [GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.en.html) license. See
165-
the [LICENSE](https://github.com/drevops/vortex/blob/1.x/LICENSE) file for more details.
165+
the [LICENSE](https://github.com/drevops/vortex/blob/main/LICENSE) file for more details.
166166

167167
:::tip
168168

.vortex/docs/content/continuous-integration/README.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ v25.11.1-db11
9393
The continuous integration pipeline is triggered by:
9494

9595
- **Push events** to the following branches:
96-
- `production`, `main`, `master`, `develop`, `1.x`, `2.x`
96+
- `production`, `main`, `master`, `develop`
9797
- `feature/*`, `bugfix/*`
9898
- `release/*`, `hotfix/*` (semantic version or date-based, e.g., `release/1.2.3`, `hotfix/2023-04-17`)
9999
- `project/*`

.vortex/docs/content/continuous-integration/circleci.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Before you begin, ensure you have:
2929

3030
[Log in to CircleCI](https://app.circleci.com/) and add your repository as a new
3131
project. CircleCI will connect to your GitHub account, detect the
32-
[`.circleci/config.yml`](https://github.com/drevops/vortex/blob/1.x/.circleci/config.yml)
32+
[`.circleci/config.yml`](https://github.com/drevops/vortex/blob/main/.circleci/config.yml)
3333
configuration file, and start running builds automatically when you push code.
3434

3535
### 2. Add SSH key for database download
@@ -84,7 +84,7 @@ same provider, you can use a single key for both operations.
8484

8585
CircleCI uses SSH key fingerprints to load the correct keys into the runner
8686
container. Update the YAML anchors in your
87-
[`.circleci/config.yml`](https://github.com/drevops/vortex/blob/1.x/.circleci/config.yml)
87+
[`.circleci/config.yml`](https://github.com/drevops/vortex/blob/main/.circleci/config.yml)
8888
file:
8989

9090
- `db_ssh_fingerprint` - your database download SSH key fingerprint

.vortex/docs/content/continuous-integration/github-actions.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Before you begin, ensure you have:
2929

3030
GitHub Actions is enabled by default. Navigate to the **Actions** tab in your
3131
repository to verify the workflow is detected. Vortex provides the workflow file
32-
at [`.github/workflows/build-test-deploy.yml`](https://github.com/drevops/vortex/blob/1.x/.github/workflows/build-test-deploy.yml).
32+
at [`.github/workflows/build-test-deploy.yml`](https://github.com/drevops/vortex/blob/main/.github/workflows/build-test-deploy.yml).
3333

3434
No additional setup is required to enable the workflow.
3535

0 commit comments

Comments
 (0)