Skip to content

Commit 83bb057

Browse files
authored
Merge pull request #1133 from bact/update-workflow-deps
Use Python 3.12 to avoid htmlmin issue with 3.13; update other dependencies
2 parents f7c1dc6 + 486a691 commit 83bb057

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

.github/workflows/publish_v3.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
jobs:
1010
build:
1111
runs-on: ubuntu-latest
12-
container: python:3
1312
env:
1413
REF_SPEC: "development/v3.0.1" # spec branch/tag release
1514
REF_MODEL: "main" # model branch/tag release
@@ -30,23 +29,28 @@ jobs:
3029
REDIRECT_TEMPLATE_PATH: "etc/redirect-template.html" # redirect HTML template
3130
steps:
3231
- name: Checkout spdx-spec
33-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
32+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
3433
with:
3534
ref: ${{ env.REF_SPEC }}
3635
path: spdx-spec
3736
fetch-depth: 0 # Because we will be pushing the gh-pages branch
3837
- name: Checkout spdx-3-model
39-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
38+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
4039
with:
4140
repository: spdx/spdx-3-model
4241
ref: ${{ env.REF_MODEL }}
4342
path: spdx-3-model
4443
- name: Checkout spec-parser
45-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
44+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
4645
with:
4746
repository: spdx/spec-parser
4847
ref: ${{ env.REF_PARSER }}
4948
path: spec-parser
49+
- name: Set up specific Python version
50+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 #v5.2.0
51+
with:
52+
python-version: "3.12"
53+
cache: "pip"
5054
- name: Install pre-requisites for spdx-spec
5155
run: pip install -r spdx-spec/requirements.txt
5256
- name: Install pre-requisites for spec-parser

.github/workflows/validate_examples.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,16 @@ jobs:
1212
validate-examples:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
15+
- name: Checkout spdx-spec
16+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
17+
- name: Set up specific Python version
18+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 #v5.2.0
19+
with:
20+
python-version: "3.12"
21+
cache: "pip"
1622
- name: Install Python dependencies
1723
run: |
18-
python3 -m pip install pyshacl==0.26.0 check-jsonschema==0.29.2
24+
python3 -m pip install check-jsonschema==0.29.4 pyshacl==0.27.0
1925
- name: Install dependencies
2026
run: |
2127
sudo apt install -y gawk

.github/workflows/validate_pull_request.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ jobs:
44
validate:
55
name: Validate build
66
runs-on: ubuntu-latest
7-
container: python:3
87
steps:
98
- name: Checkout spdx-spec
10-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
9+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
1110
with:
1211
fetch-depth: 1
12+
- name: Set up specific Python version
13+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 #v5.2.0
14+
with:
15+
python-version: "3.12"
16+
cache: "pip"
1317
- name: Install pre-requisites
1418
run: pip install -r requirements.txt
1519
- name: Build the site to validate (use mkdocs.yml, no model files, no PDF export)

bin/pull-license-list.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# usage: ./bin/pull-license.py
77
#
8-
# Script licensed under SPDX-License-Identifier: MIT
8+
# SPDX-License-Identifier: MIT
99

1010
import codecs
1111
import itertools

0 commit comments

Comments
 (0)