Skip to content

Commit 0649839

Browse files
committed
v3.1-dev -> v3.1.x-dev
Signed-off-by: Arthit Suriyawongkul <[email protected]>
1 parent fd4776f commit 0649839

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

.github/workflows/publish_v3.yml

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Publish SPDX specification to https://spdx.github.io/spdx-spec/
22
#
33
# There will be this workflow in "main", "develop", and "support" branches.
4-
# Each of them publish to a different URL.
4+
# Each branch publishes to a different URL.
55
#
66
# For example,
7-
# the workflow in "main" may publish to https://spdx.github.io/spdx-spec/3.0.1/,
8-
# the workflow in "develop" may publish to https://spdx.github.io/spdx-spec/3.1-dev/,
9-
# the workflow in "support/3.0" may publish to https://spdx.github.io/spdx-spec/3.0.0/.
7+
# the workflow in "main" may publish to https://spdx.github.io/spdx-spec/v3.0.1/,
8+
# the workflow in "develop" may publish to https://spdx.github.io/spdx-spec/v3.1.x-dev/,
9+
# the workflow in "support/3.0" may publish to https://spdx.github.io/spdx-spec/v3.0.x/.
1010
#
1111
# The workflow should be configured to have an URL without a version number
1212
# specified be redirected to an URL published from "main" branch.
@@ -40,17 +40,17 @@ jobs:
4040
env:
4141
REF_SPEC: "develop" # spdx-spec branch: "main" or "develop" or "support/x.y" or tag/commit ID
4242
REF_MODEL: "develop" # spdx-3-model branch: "main" or "develop" or "support/x.y" or tag/commit ID
43-
REF_PARSER: "main" # spec-parser branch: "main" or commit ID
43+
REF_PARSER: "main" # spec-parser branch: "main" or tag/commit ID
4444
GH_PAGES_BRANCH: "gh-pages" # spdx-spec branch to publish HTML to
4545
VERSION_DEFAULT: "v3.0.1" # Default version:
4646
# - A version to be redirected to from the URL without
4747
# a version number specified
48-
# - Should be a latest stable version from "main" branch
49-
# - VERSION_DEFAULT should be the same in this workflow
50-
# across all branches/tags
51-
# - VERSION_DEFAULT should also match with the
48+
# - Should be the latest stable version from the "main" branch
49+
# - VERSION_DEFAULT should be the same across all
50+
# branches/tags
51+
# - VERSION_DEFAULT should also match the
5252
# mike's canonical_version in mkdocs.yml
53-
VERSION: "v3.1-dev" # Publishing version, to be publish by this workflow:
53+
VERSION: "v3.1.x-dev" # Publishing version, to be published from this branch:
5454
# - VERSION can be different from VERSION_DEFAULT;
5555
# For example, if VERSION is a draft/release candidate,
5656
# or if VERSION is a stable version that is behind the
@@ -85,9 +85,10 @@ jobs:
8585
REDIRECT_TEMPLATE_PATH: "etc/redirect-template.html" # URL redirect HTML template
8686
steps:
8787
- name: Expand version aliases to include a version without 'v' prefix
88-
# VERSION: "v3.0.1"
89-
# Original VERSION_ALIASES: "latest v3.0"
90-
# Expanded VERSION_ALIASES: "3.0.1 latest v3.0 3.0"
88+
# For example, given
89+
# - VERSION: "v3.0.1"; and
90+
# - Original VERSION_ALIASES: "latest v3.0"
91+
# the expanded VERSION_ALIASES will be "3.0.1 latest v3.0 3.0"
9192
run: |
9293
echo VERSION: $VERSION
9394
echo Original VERSION_ALIASES: $VERSION_ALIASES

mkdocs.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
site_name: SPDX Specification 3.1-dev
2-
site_description: The System Package Data Exchange (SPDX) Specification Version 3.1-dev - Open standard for creating Software Bills of Materials (SBOMs)
1+
site_name: SPDX Specification 3.1.x-dev
2+
site_description: The System Package Data Exchange (SPDX) Specification Version 3.1.x-dev - Open standard for creating Software Bills of Materials (SBOMs)
33
site_author: The Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors.
44
site_url: https://spdx.github.io/spdx-spec/ # set to the "root" of the site, to be combined with canonical_version
55
repo_url: https://github.com/spdx/spdx-spec/
66
edit_uri: "" # set to an empty string to disable edit links; to enable, set to blob/<branch_name>/docs/
7-
copyright: SPDX v3.1-dev Copyright © 2010-2025, The Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors.
7+
copyright: SPDX v3.1.x-dev Copyright © 2010-2025, The Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors.
88
use_directory_urls: true
99
theme:
1010
name: readthedocs
1111
sticky_navigation: true
1212
plugins:
1313
- search
1414
- mike:
15-
canonical_version: v3.0.1 # tell search engines to prefer the URL of v3.0.1
16-
# This should matches with VERSION_DEFAULT
17-
# in .github/workflows/publis_v3yml
15+
canonical_version: v3.0.1 # Tell search engines to prefer the URL of the default version.
16+
# This should matches with VERSION_DEFAULTin .github/workflows/publish_v3yml
1817
alias_type: redirect # use redirect so it can redirect every pages (not just the root of the version)
1918
# - pdf-export:
2019
# combined: true

0 commit comments

Comments
 (0)