diff --git a/.github/workflows/candidate_release.yml b/.github/workflows/candidate_release.yml index 26f1fb644..cb3e69939 100644 --- a/.github/workflows/candidate_release.yml +++ b/.github/workflows/candidate_release.yml @@ -2,36 +2,36 @@ name: generate_candidate_release_spec on: push: branches: - - 'candidate_release' + - "candidate_recommendation" jobs: - # The job that will use the container image you just pushed to ghcr.io - gen_pdf: - runs-on: ubuntu-20.04 - container: - image: pandoc/extra:latest-ubuntu - steps: - - name: Check out repository code - uses: actions/checkout@v3 - - name: Install prequirements - shell: bash - run: | - /usr/bin/apt-get -y update - wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb - DEBIAN_FRONTEND=noninteractive /usr/bin/apt install -y make - DEBIAN_FRONTEND=noninteractive /usr/bin/apt install -y -f ./wkhtmltox_0.12.6.1-2.jammy_amd64.deb - /usr/bin/pip3 install -r requirements.txt - - name: Build PDF - shell: bash - working-directory: ./specification - run: | - make STYLE=candidate_release - - name: Upload Spec - uses: actions/upload-artifact@v3.1.2 - with: - name: FOCUS_specification - path: | - specification/spec.html - specification/spec.pdf - specification/images/* - specification/styles/* + # The job that will use the container image you just pushed to ghcr.io + gen_pdf: + runs-on: ubuntu-20.04 + container: + image: pandoc/extra:latest-ubuntu + steps: + - name: Check out repository code + uses: actions/checkout@v3 + - name: Install prequirements + shell: bash + run: | + /usr/bin/apt-get -y update + wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb + DEBIAN_FRONTEND=noninteractive /usr/bin/apt install -y make + DEBIAN_FRONTEND=noninteractive /usr/bin/apt install -y -f ./wkhtmltox_0.12.6.1-2.jammy_amd64.deb + /usr/bin/pip3 install --break-system-packages -r requirements.txt + - name: Build PDF + shell: bash + working-directory: ./specification + run: | + make STYLE=candidate_release + - name: Upload Spec + uses: actions/upload-artifact@v3.1.2 + with: + name: FOCUS_specification + path: | + specification/spec.html + specification/spec.pdf + specification/images/* + specification/styles/* diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c58f4281..3de84c958 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,36 +2,36 @@ name: generate_publication_spec on: push: branches: - - 'main' + - "main" jobs: - # The job that will use the container image you just pushed to ghcr.io - gen_pdf: - runs-on: ubuntu-20.04 - container: - image: pandoc/extra:latest-ubuntu - steps: - - name: Check out repository code - uses: actions/checkout@v3 - - name: Install prequirements - shell: bash - run: | - /usr/bin/apt-get -y update - wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb - DEBIAN_FRONTEND=noninteractive /usr/bin/apt install -y make - DEBIAN_FRONTEND=noninteractive /usr/bin/apt install -y -f ./wkhtmltox_0.12.6.1-2.jammy_amd64.deb - /usr/bin/pip3 install -r requirements.txt - - name: Build PDF - shell: bash - working-directory: ./specification - run: | - make STYLE=main - - name: Upload Spec - uses: actions/upload-artifact@v3.1.2 - with: - name: FOCUS_specification - path: | - specification/spec.html - specification/spec.pdf - specification/images/* - specification/styles/* + # The job that will use the container image you just pushed to ghcr.io + gen_pdf: + runs-on: ubuntu-20.04 + container: + image: pandoc/extra:latest-ubuntu + steps: + - name: Check out repository code + uses: actions/checkout@v3 + - name: Install prequirements + shell: bash + run: | + /usr/bin/apt-get -y update + wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb + DEBIAN_FRONTEND=noninteractive /usr/bin/apt install -y make + DEBIAN_FRONTEND=noninteractive /usr/bin/apt install -y -f ./wkhtmltox_0.12.6.1-2.jammy_amd64.deb + /usr/bin/pip3 install --break-system-packages -r requirements.txt + - name: Build PDF + shell: bash + working-directory: ./specification + run: | + make STYLE=main + - name: Upload Spec + uses: actions/upload-artifact@v3.1.2 + with: + name: FOCUS_specification + path: | + specification/spec.html + specification/spec.pdf + specification/images/* + specification/styles/* diff --git a/.github/workflows/working_draft.yml b/.github/workflows/working_draft.yml index d02255d8d..0e446d759 100644 --- a/.github/workflows/working_draft.yml +++ b/.github/workflows/working_draft.yml @@ -2,38 +2,38 @@ name: generate_draft_spec on: push: branches: - - '*' - - '!main' - - '!candidate_release' + - "*" + - "!main" + - "!candidate_release" jobs: - # The job that will use the container image you just pushed to ghcr.io - gen_pdf: - runs-on: ubuntu-20.04 - container: - image: pandoc/extra:latest-ubuntu - steps: - - name: Check out repository code - uses: actions/checkout@v3 - - name: Install prequirements - shell: bash - run: | - /usr/bin/apt-get -y update - wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb - DEBIAN_FRONTEND=noninteractive /usr/bin/apt install -y make - DEBIAN_FRONTEND=noninteractive /usr/bin/apt install -y -f ./wkhtmltox_0.12.6.1-2.jammy_amd64.deb - /usr/bin/pip3 install -r requirements.txt - - name: Build PDF - shell: bash - working-directory: ./specification - run: | - make STYLE=working_draft - - name: Upload Spec - uses: actions/upload-artifact@v3.1.2 - with: - name: FOCUS_specification - path: | - specification/spec.html - specification/spec.pdf - specification/images/* - specification/styles/* + # The job that will use the container image you just pushed to ghcr.io + gen_pdf: + runs-on: ubuntu-20.04 + container: + image: pandoc/extra:latest-ubuntu + steps: + - name: Check out repository code + uses: actions/checkout@v3 + - name: Install prequirements + shell: bash + run: | + /usr/bin/apt-get -y update + wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb + DEBIAN_FRONTEND=noninteractive /usr/bin/apt install -y make + DEBIAN_FRONTEND=noninteractive /usr/bin/apt install -y -f ./wkhtmltox_0.12.6.1-2.jammy_amd64.deb + /usr/bin/pip3 install --break-system-packages -r requirements.txt + - name: Build PDF + shell: bash + working-directory: ./specification + run: | + make STYLE=working_draft + - name: Upload Spec + uses: actions/upload-artifact@v3.1.2 + with: + name: FOCUS_specification + path: | + specification/spec.html + specification/spec.pdf + specification/images/* + specification/styles/* diff --git a/requirements.txt b/requirements.txt index 7a6ec4b91..5b023374b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ watchdog==3.0.0 -pymarkdownlnt==0.9.11 +pymarkdownlnt==0.9.12 diff --git a/specification/versions/candidate_release.md b/specification/versions/candidate_release.md index 069e1b950..ce5561cc9 100644 --- a/specification/versions/candidate_release.md +++ b/specification/versions/candidate_release.md @@ -22,7 +22,7 @@ This document should be considered a draft document and may be updated, replaced This document was produced by a group operating under the Joint Development Foundation Projects agreement. FOCUS maintains a public list of any patent disclosures made in connection with the deliverables of the group; [that page](https://github.com/FinOps-Open-Cost-and-Usage-Spec/FOCUS_Spec/blob/working_draft/ipr.md) also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains Essential Claim(s) must disclose the information. -This document is governed by the Patent Policy Option 3: Open Web Foundation 1.0 Mode: +This document is governed by the Patent Policy Option 4: W3C Mode: See [project charter](https://github.com/FinOps-Open-Cost-and-Usage-Spec/foundation/blob/main/FOCUS_-_Membership_Agreement_Package_for_use.pdf).
diff --git a/specification/versions/main.md b/specification/versions/main.md index cdf47c6a6..5d91d27ab 100644 --- a/specification/versions/main.md +++ b/specification/versions/main.md @@ -12,7 +12,7 @@ This is a published release of the FinOps Open Cost and Usage Specification. This document was produced by a group operating under the Joint Development Foundation Projects agreement. FOCUS maintains a public list of any patent disclosures made in connection with the deliverables of the group; [that page](https://github.com/FinOps-Open-Cost-and-Usage-Spec/FOCUS_Spec/blob/working_draft/ipr.md) also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains Essential Claim(s) must disclose the information. -This document is governed by the Patent Policy Option 3: Open Web Foundation 1.0 Mode: +This document is governed by the Patent Policy Option 4: W3C Mode: See [project charter](https://github.com/FinOps-Open-Cost-and-Usage-Spec/foundation/blob/main/FOCUS_-_Membership_Agreement_Package_for_use.pdf). diff --git a/specification/versions/working_draft.md b/specification/versions/working_draft.md index 764d9e72d..5f361f312 100644 --- a/specification/versions/working_draft.md +++ b/specification/versions/working_draft.md @@ -22,7 +22,7 @@ This document should be considered a draft document and may be updated, replaced This document was produced by a group operating under the Joint Development Foundation Projects agreement. FOCUS maintains a public list of any patent disclosures made in connection with the deliverables of the group; [that page](https://github.com/FinOps-Open-Cost-and-Usage-Spec/FOCUS_Spec/blob/working_draft/ipr.md) also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains Essential Claim(s) must disclose the information. -This document is governed by the Patent Policy Option 3: Open Web Foundation 1.0 Mode: +This document is governed by the Patent Policy Option 4: W3C Mode: See [project charter](https://github.com/FinOps-Open-Cost-and-Usage-Spec/foundation/blob/main/FOCUS_-_Membership_Agreement_Package_for_use.pdf).