Skip to content

Commit

Permalink
Merge pull request #1133 from bact/update-workflow-deps
Browse files Browse the repository at this point in the history
Use Python 3.12 to avoid htmlmin issue with 3.13; update other dependencies
  • Loading branch information
bact authored Oct 13, 2024
2 parents f7c1dc6 + 486a691 commit 83bb057
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 9 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/publish_v3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
jobs:
build:
runs-on: ubuntu-latest
container: python:3
env:
REF_SPEC: "development/v3.0.1" # spec branch/tag release
REF_MODEL: "main" # model branch/tag release
Expand All @@ -30,23 +29,28 @@ jobs:
REDIRECT_TEMPLATE_PATH: "etc/redirect-template.html" # redirect HTML template
steps:
- name: Checkout spdx-spec
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
with:
ref: ${{ env.REF_SPEC }}
path: spdx-spec
fetch-depth: 0 # Because we will be pushing the gh-pages branch
- name: Checkout spdx-3-model
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
with:
repository: spdx/spdx-3-model
ref: ${{ env.REF_MODEL }}
path: spdx-3-model
- name: Checkout spec-parser
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
with:
repository: spdx/spec-parser
ref: ${{ env.REF_PARSER }}
path: spec-parser
- name: Set up specific Python version
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 #v5.2.0
with:
python-version: "3.12"
cache: "pip"
- name: Install pre-requisites for spdx-spec
run: pip install -r spdx-spec/requirements.txt
- name: Install pre-requisites for spec-parser
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/validate_examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,16 @@ jobs:
validate-examples:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
- name: Checkout spdx-spec
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
- name: Set up specific Python version
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 #v5.2.0
with:
python-version: "3.12"
cache: "pip"
- name: Install Python dependencies
run: |
python3 -m pip install pyshacl==0.26.0 check-jsonschema==0.29.2
python3 -m pip install check-jsonschema==0.29.4 pyshacl==0.27.0
- name: Install dependencies
run: |
sudo apt install -y gawk
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/validate_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@ jobs:
validate:
name: Validate build
runs-on: ubuntu-latest
container: python:3
steps:
- name: Checkout spdx-spec
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
with:
fetch-depth: 1
- name: Set up specific Python version
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 #v5.2.0
with:
python-version: "3.12"
cache: "pip"
- name: Install pre-requisites
run: pip install -r requirements.txt
- name: Build the site to validate (use mkdocs.yml, no model files, no PDF export)
Expand Down
2 changes: 1 addition & 1 deletion bin/pull-license-list.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# usage: ./bin/pull-license.py
#
# Script licensed under SPDX-License-Identifier: MIT
# SPDX-License-Identifier: MIT

import codecs
import itertools
Expand Down

0 comments on commit 83bb057

Please sign in to comment.