Skip to content

Commit

Permalink
Merge pull request #855 from tschmidtb51/editorial-2025-01-29
Browse files Browse the repository at this point in the history
Seed Editor revision 2025-01-29
  • Loading branch information
tschmidtb51 authored Jan 17, 2025
2 parents 6dcea01 + 3b77317 commit b7d4282
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 27 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/csaf_2.0_cpe.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CPE Dictionary Test (CSAF 2.0)

on:
on:
push:
paths:
- 'csaf_2.0/**'
Expand All @@ -13,9 +13,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'
- name: Perform CPE Dictionary Test
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/csaf_2.0_filenames.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CSAF Filenames Test (CSAF 2.0)

on:
on:
push:
paths:
- 'csaf_2.0/**'
Expand All @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup pip package "paikalta"
run: pip install paikalta
- name: Test filenames of CSAF filename test files in filenames/data/valid/*.json
Expand All @@ -22,11 +22,11 @@ jobs:
run: ./csaf_2.0/test/filenames/run_invalid_tests.sh ./csaf_2.0/test/filenames/data/invalid/*.json
- name: Test filenames of CSAF examples
run: ./csaf_2.0/test/filenames/run_tests.sh ./csaf_2.0/examples/csaf/*.json
- name: Test filenames of CSAF examples - profile specific folders
- name: Test filenames of CSAF examples - profile specific folders
run: ./csaf_2.0/test/filenames/run_tests.sh ./csaf_2.0/examples/csaf/csaf_*/*.json
- name: Test filenames of CSAF test files in validator/data/mandatory
run: ./csaf_2.0/test/filenames/run_tests.sh ./csaf_2.0/test/validator/data/mandatory/*.json
- name: Test filenames of CSAF test files in validator/data/optional
- name: Test filenames of CSAF test files in validator/data/optional
run: ./csaf_2.0/test/filenames/run_tests.sh ./csaf_2.0/test/validator/data/optional/*.json
- name: Test filenames of CSAF test files in validator/data/informative
run: ./csaf_2.0/test/filenames/run_tests.sh ./csaf_2.0/test/validator/data/informative/*.json
6 changes: 3 additions & 3 deletions .github/workflows/csaf_2.0_main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: JSON Schema Tests (CSAF 2.0)

on:
on:
push:
paths:
- 'csaf_2.0/**'
Expand All @@ -14,7 +14,7 @@ jobs:
name: Test JSON schemas
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Prepare environment
run: |
sudo apt-get remove python3-jsonschema
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Test examples against Aggregator schema
run: ./csaf_2.0/test/aggregator_schema/run_tests.sh
- name: Upload strict JSON schema artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: strict-schemas
path: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/csaf_2.0_mandatory-tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CSAF Mandatory Tests (CSAF 2.0)

on:
on:
push:
paths:
- 'csaf_2.0/**'
Expand All @@ -13,9 +13,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'
- name: Setup csaf-validator-lib
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/csaf_2.0_validator.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Validator Data Test (CSAF 2.0)

on:
on:
push:
paths:
- 'csaf_2.0/**'
Expand All @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Prepare environment
run: |
sudo apt-get remove python3-jsonschema
Expand All @@ -35,4 +35,4 @@ jobs:
run: ./csaf_2.0/test/validator/run_tests.sh informative

- name: Test validator/data/testcases.json against testcase schema
run: ./csaf_2.0/test/validator/check_testcases.sh
run: ./csaf_2.0/test/validator/check_testcases.sh
4 changes: 2 additions & 2 deletions .github/workflows/csaf_2.1_cpe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'
- name: Perform CPE Dictionary Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/csaf_2.1_filenames.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup pip package "paikalta"
run: pip install paikalta
- name: Test filenames of CSAF filename test files in filenames/data/valid/*.json
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/csaf_2.1_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Test JSON schemas
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Prepare environment
run: |
sudo apt-get remove python3-jsonschema
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Test examples against Aggregator schema
run: ./csaf_2.1/test/aggregator_schema/run_tests.sh
- name: Upload strict JSON schema artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: strict-schemas
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/csaf_2.1_mandatory-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'
- name: Setup csaf-validator-lib
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/csaf_2.1_validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Prepare environment
run: |
sudo apt-get remove python3-jsonschema
Expand Down
4 changes: 2 additions & 2 deletions csaf_2.1/prose/edit/src/frontmatter.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

## Committee Specification Draft 01

## 27 November 2024
## 29 January 2025

#### This stage:
https://docs.oasis-open.org/csaf/csaf/v2.1/csd01/csaf-v2.1-csd01.md (Authoritative) \
Expand Down Expand Up @@ -71,7 +71,7 @@ When referencing this specification the following citation format should be used

**[csaf-v2.1]**

_Common Security Advisory Framework Version 2.1_. Edited by Stefan Hagen, and Thomas Schmidt. 27 November 2024. OASIS Committee Specification Draft 01. https://docs.oasis-open.org/csaf/csaf/v2.1/csd01/csaf-v2.1-csd01.html. Latest stage: https://docs.oasis-open.org/csaf/csaf/v2.1/csaf-v2.1.html.
_Common Security Advisory Framework Version 2.1_. Edited by Stefan Hagen, and Thomas Schmidt. 29 January 2025. OASIS Committee Specification Draft 01. https://docs.oasis-open.org/csaf/csaf/v2.1/csd01/csaf-v2.1-csd01.html. Latest stage: https://docs.oasis-open.org/csaf/csaf/v2.1/csaf-v2.1.html.


-------
Expand Down
2 changes: 1 addition & 1 deletion csaf_2.1/prose/edit/src/revision-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ toc:
| csaf-v2.0-wd20240828-dev | 2024-08-28 | Stefan Hagen and Thomas Schmidt | Next Editor Revision |
| csaf-v2.0-wd20241030-dev | 2024-10-30 | Stefan Hagen and Thomas Schmidt | Next Editor Revision |
| csaf-v2.0-wd20241127-dev | 2024-11-27 | Stefan Hagen and Thomas Schmidt | Next Editor Revision |

| csaf-v2.0-wd20250129-dev | 2025-01-29 | Stefan Hagen and Thomas Schmidt | Next Editor Revision |
-------

0 comments on commit b7d4282

Please sign in to comment.