Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update publish CI for support/2.3 branch #1172

Open
wants to merge 2 commits into
base: support/2.3
Choose a base branch
from
Open
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
45 changes: 23 additions & 22 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,65 +1,66 @@
on:
push:
branches: [master, development/v2.3]
branches: [support/2.3, support/2.3.1]
workflow_dispatch:

jobs:
build_current:
name: Build current
if: github.ref == 'refs/heads/master'
name: Build v2.3
if: github.ref == 'refs/heads/support/2.3'
runs-on: ubuntu-latest
container: python:3
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
with:
ref: 'master'
ref: 'support/2.3'
- name: Install pre-requisites
run: pip install -r requirements.txt
- name: Build
run: mkdocs build -v --clean
- name: Schema
run: generate-schema-doc schemas/spdx-schema.json site/spdx-json-schema.html
- name: Upload
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
with:
name: site-current
name: site-v2.3
path: ./site
build_v2-draft:
name: Build v2-draft
if: github.ref == 'refs/heads/development/v2.3'
name: Build v2.3.1-draft
if: github.ref == 'refs/heads/support/2.3.1'
runs-on: ubuntu-latest
container: python:3
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
with:
ref: 'development/v2.3'
ref: 'support/2.3.1'
- name: Install pre-requisites
run: pip install -r requirements.txt
- name: Build
run: mkdocs build -v --clean
- name: Schema
run: generate-schema-doc schemas/spdx-schema.json site/spdx-json-schema.html
- name: Upload
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b #v4.5.0
with:
name: site-v2-draft
name: site-v2.3.1-draft
path: ./site
publish:
name: Publish
runs-on: ubuntu-latest
needs: [build_current, build_v2-draft]
steps:
- name: Download current
uses: actions/download-artifact@v1
- name: Download v2.3
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 #v4.1.8
with:
name: site-current
path: ./site
- name: Download v2-draft
uses: actions/download-artifact@v1
name: site-v2.3
path: ./site/v2.3
- name: Download v2.3.1-draft
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 #v4.1.8
with:
name: site-v2-draft
path: ./site/v2-draft
name: site-v2.3.1-draft
path: ./site/v2.3.1-draft
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e #v4.0.0
with:
DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
PUBLISH_BRANCH: gh-pages
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish_common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:
workflow_dispatch:
inputs:
ref:
description: Branch or tag to publish (e.g. refs/heads/development/v2).
description: Branch or tag to publish (e.g. refs/heads/support/2.3).
required: true
default: refs/heads/master
default: refs/heads/support/2.3
aliases:
description: Space-delimited aliases to publish (e.g. latest v2-latest).
required: false
Expand All @@ -16,14 +16,14 @@ jobs:
runs-on: ubuntu-latest
container: python:3.9
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
with:
ref: ${{ github.event.client_payload.ref || github.event.inputs.ref }}
fetch-depth: 0 # Because we will be pushing the gh-pages branch
- name: Install pre-requisites
run: pip install -r requirements.txt
- name: Install mike
run: pip install mike==1.1.2
run: pip install mike==2.1.3
- name: Extract branch or tag name
id: extract-branch-or-tag-name
run: echo "::set-output name=ref_name::${REF##*/}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
container: python:3
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
with:
fetch-depth: 1
- name: Install pre-requisites
Expand Down
5 changes: 2 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
mkdocs==1.3.1
json-schema-for-humans==0.39.5

json-schema-for-humans==1.3.4
mkdocs==1.6.1
Loading