Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
container: khronosgroup/docker-images@sha256:f1ca671f3bdb10ad49e238b9bf28853088a21af49504498fc9084c9b4fea4762

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: REUSE license checker
run: reuse lint

Expand All @@ -46,7 +46,7 @@ jobs:
# This causes 'fatal: detected dubious ownership in repostory' and
# failure to run the checks, although it is not actually propagated
# back to the Makefile as errors.
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Internal self-test of the check_spec_links script
run: pytest test*.py
working-directory: scripts
Expand All @@ -70,7 +70,7 @@ jobs:
# This only runs on merge requests where CI_COMMIT_BRANCH is defined, and is
# a valid extension name, or is mapped to one in an exception list in
# scripts/testSpecVersion.py
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- run: |
echo "Branch name is ${{github.ref_name}}"
python3 scripts/testSpecVersion.py -branch ${{github.ref_name}} -test -build
Expand All @@ -81,7 +81,7 @@ jobs:
container: khronosgroup/docker-images@sha256:f1ca671f3bdb10ad49e238b9bf28853088a21af49504498fc9084c9b4fea4762

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- run: ./testBuild

spec-core:
Expand All @@ -90,7 +90,7 @@ jobs:
container: khronosgroup/docker-images@sha256:f1ca671f3bdb10ad49e238b9bf28853088a21af49504498fc9084c9b4fea4762

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- run: ./makeSpec -clean -spec core -genpath gencore QUIET= -j${nproc} -Otarget html

spec-generate:
Expand All @@ -99,7 +99,7 @@ jobs:
container: khronosgroup/docker-images@sha256:f1ca671f3bdb10ad49e238b9bf28853088a21af49504498fc9084c9b4fea4762

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Validate the XML before building anything using it
run: make -C xml validate
- name: Build the ratified-only spec, to catch incorrect ifdef errors affecting ratification submissions
Expand All @@ -117,7 +117,7 @@ jobs:
# Make a single tarball to upload instead
run: tar -cvf spec-outputs.tar gen/ genrat/
- name: Archive generated spec
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: spec-outputs
path: spec-outputs.tar
Expand All @@ -130,11 +130,11 @@ jobs:
continue-on-error: true

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
# Generate the vulkan C++ header (vulkan.hpp)
# Failure (should be) allowed, for now
- name: Download generated spec
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: spec-outputs
- name: Unpack generated spec
Expand All @@ -152,7 +152,7 @@ jobs:
cmake --build build --parallel
cp vulkan/*.hpp ${SPEC_DIR}/gen/include/vulkan/
- name: Upload generated hpp
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: hpp-outputs
path: gen/include/
Expand All @@ -166,7 +166,7 @@ jobs:
continue-on-error: true

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Sparse/shallow clone of CTS GitHub repository to pull only relevant parts
run: |
git clone --sparse --depth 1 --single-branch --branch main https://github.com/KhronosGroup/VK-GL-CTS.git
Expand All @@ -190,9 +190,9 @@ jobs:
needs: spec-generate

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Download generated files
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: spec-outputs
- name: Unpack generated spec
Expand All @@ -215,15 +215,15 @@ jobs:
cpp_standard: [c++11, c++14, c++17, c++20, c++23]

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Download generated spec
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: spec-outputs
- name: Unpack generated spec
run: tar -xvf spec-outputs.tar
- name: Download generated hpp
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: hpp-outputs
path: gen/include/
Expand Down
48 changes: 0 additions & 48 deletions .reuse/dep5

This file was deleted.

1 change: 1 addition & 0 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ CONTRIBUTING.adoc Requirements for external contributions to the repository
COPYING.adoc Copyright and licensing information
CODE_OF_CONDUCT.adoc Code of Conduct
LICENSE.adoc Summary of licenses used by files in the repository
REUSE.toml License exceptions for the REUSE tool
ChangeLog.adoc Change log summary for each public Vulkan spec update
ChangeLogSC.adoc Change log summary for each public Vulkan SC spec update
Makefile, make* Makefile and helper build scripts (see BUILD.adoc)
Expand Down
69 changes: 69 additions & 0 deletions REUSE.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
version = 1
SPDX-PackageName = "Vulkan-Docs"
SPDX-PackageDownloadLocation = "https://github.com/KhronosGroup/Vulkan-Docs"

[[annotations]]
path = ["images/**.svg", "config/chunkindex/custom.patch", "config/CI/**", "config/**/docinfo-header.html", "build_tests/expectations/**", "build_tests/images/**.svg", "images/proposals/**.svg"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2015-2026 The Khronos Group Inc."
SPDX-License-Identifier = "CC-BY-4.0"

[[annotations]]
path = "katex/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "2013-2019 Khan Academy and other contributors"
SPDX-License-Identifier = "MIT"

[[annotations]]
path = "config/chunkindex/lunr.js"
precedence = "aggregate"
SPDX-FileCopyrightText = "2019 Oliver Nightingale"
SPDX-License-Identifier = "MIT"

[[annotations]]
path = "config/optimize-pdf"
precedence = "aggregate"
SPDX-FileCopyrightText = "2014-2016 OpenDevise Inc. and the Asciidoctor Project"
SPDX-License-Identifier = "MIT"

[[annotations]]
path = "config/khronos.css"
precedence = "aggregate"
SPDX-FileCopyrightText = "2013 Dan Allen"
SPDX-License-Identifier = "MIT"

[[annotations]]
path = "config/fonts/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "2019 M+ Fonts Project"
SPDX-License-Identifier = "LicenseRef-MPLUS"

[[annotations]]
path = "scripts/htmldiff/htmldiff.pl"
precedence = "aggregate"
SPDX-FileCopyrightText = ["1998-2006 MACS, Inc.", "2007 SiSco, Inc."]
SPDX-License-Identifier = "MIT"

[[annotations]]
path = ["**.json", "scripts/vuidCounts.py", "config/chunkindex/addscript.**"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2020-2026 The Khronos Group Inc."
SPDX-License-Identifier = "Apache-2.0"

[[annotations]]
path = "config/copyright-spec.adoc"
precedence = "aggregate"
SPDX-FileCopyrightText = "2014-2026 The Khronos Group Inc"
SPDX-License-Identifier = "LicenseRef-KhronosSpecCopyright"

[[annotations]]
path = "scripts/asciidoctor-chunker/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "2021 Wataru Shito (@waterloo_jp)"
SPDX-License-Identifier = "MIT"

[[annotations]]
path = ".gitlab/merge_request_templates/extensiontemplate.md"
precedence = "aggregate"
SPDX-FileCopyrightText = "2026 The Khronos Group Inc"
SPDX-License-Identifier = "CC-BY-4.0"