Skip to content

Commit bc92332

Browse files
committed
[#2104] Added SemVer+CalVer versioning support for Vortex development.
1 parent 81a3fd5 commit bc92332

37 files changed

Lines changed: 225 additions & 78 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)$|^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|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]+)?$/
687687
tags:
688688
ignore: /.*/
689689
- deploy-tags:

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
- main
1616
- master
1717
- develop
18+
#;< VORTEX_DEV
19+
- 1.x
20+
- 2.x
21+
#;> VORTEX_DEV
1822
- release/**
1923
- hotfix/**
2024
- project/**
@@ -32,6 +36,10 @@ on:
3236
- main
3337
- master
3438
- develop
39+
#;< VORTEX_DEV
40+
- 1.x
41+
- 2.x
42+
#;> VORTEX_DEV
3543
- release/**
3644
- hotfix/**
3745
- project/**

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
- '*'
77
branches:
88
- develop
9+
#;< VORTEX_DEV
10+
- 1.x
11+
- 2.x
12+
#;> VORTEX_DEV
913

1014
permissions:
1115
contents: write

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@ on:
55
push:
66
branches:
77
- develop
8+
- 1.x
9+
- 2.x
810
pull_request:
911
branches:
1012
- develop
13+
- 1.x
14+
- 2.x
1115
- 'feature/**'
1216
- 'bugfix/**'
1317

.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: develop
91+
production-branch: 1.x
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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@ on:
55
push:
66
branches:
77
- develop
8+
- 1.x
9+
- 2.x
810
pull_request:
911
branches:
1012
- develop
13+
- 1.x
14+
- 2.x
1115
- 'feature/**'
1216
- 'bugfix/**'
1317

.vortex/docs/content/README.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Refer to [Contributing](contributing) for more details.
6666
## ⚖️ License
6767

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

7171
:::tip
7272

.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/develop/.circleci/config.yml)
32+
[`.circleci/config.yml`](https://github.com/drevops/vortex/blob/1.x/.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/develop/.circleci/config.yml)
87+
[`.circleci/config.yml`](https://github.com/drevops/vortex/blob/1.x/.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/develop/.github/workflows/build-test-deploy.yml).
32+
at [`.github/workflows/build-test-deploy.yml`](https://github.com/drevops/vortex/blob/1.x/.github/workflows/build-test-deploy.yml).
3333

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

.vortex/docs/content/contributing/code-of-conduct.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ sidebar_position: 3
66
# Code of conduct
77

88
Please note that this project is released with
9-
a [Contributor Code of Conduct](https://github.com/drevops/vortex/blob/develop/CODE_OF_CONDUCT.md). By participating in this
9+
a [Contributor Code of Conduct](https://github.com/drevops/vortex/blob/1.x/CODE_OF_CONDUCT.md). By participating in this
1010
project you agree to abide by its terms.

0 commit comments

Comments
 (0)