From 381905e591617d7d68473450af4b1feeb8f46b36 Mon Sep 17 00:00:00 2001 From: object-Object Date: Sun, 24 Sep 2023 21:32:28 -0400 Subject: [PATCH] Fix artifact names and add python-version param --- .github/workflows/build_docs.yml | 1 + .github/workflows/hexdoc.yml | 26 +++++++++++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index d1f5bba4..747b9821 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -53,6 +53,7 @@ jobs: pages: read with: + python-version: "3.11" checkout: ${{ github.event_name == 'workflow_dispatch' && inputs.branch != '(same as workflow)' }} branch: ${{ inputs.branch }} publish-latest-and-root: |- diff --git a/.github/workflows/hexdoc.yml b/.github/workflows/hexdoc.yml index 3189f1f9..3a1c59a5 100644 --- a/.github/workflows/hexdoc.yml +++ b/.github/workflows/hexdoc.yml @@ -3,6 +3,10 @@ name: Build and publish a hexdoc project to GitHub Pages on: workflow_call: inputs: + python-version: + description: Python version to install + type: string + required: true checkout: description: Whether to check out the branch specified in `branch` type: boolean @@ -54,7 +58,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.11" + python-version: ${{ inputs.python-version }} cache: pip - name: Get Pages url @@ -136,11 +140,11 @@ jobs: mkdir -p _site/v/latest/dist cp -r dist _site/v/latest/dist - - name: Upload Pages artifact + - name: Upload temporary Pages artifact if: steps.parse-inputs.outputs.update-latest uses: actions/upload-artifact@v3 with: - name: github-pages + name: github-pages-tmp path: _site - name: Add job summary @@ -164,8 +168,8 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/install-artifact-wheel with: - name: docgen-build - python-version: "3.11" + name: hexdoc-build + python-version: ${{ inputs.python-version }} - name: Checkout input branch if: needs.build.outputs.branch != 'none' @@ -183,10 +187,10 @@ jobs: if: steps.gen-normal.outcome == 'failure' run: $HEXDOC --allow-missing - - name: Upload Pages artifact + - name: Upload temporary Pages artifact uses: actions/upload-artifact@v3 with: - name: github-pages + name: github-pages-tmp path: _site - name: Fail if the first generate step failed @@ -206,8 +210,8 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/install-artifact-wheel with: - name: docgen-build - python-version: "3.11" + name: hexdoc-build + python-version: ${{ inputs.python-version }} - name: Checkout current Pages uses: actions/checkout@v3 @@ -216,10 +220,10 @@ jobs: ref: gh-pages path: _site/dst - - name: Download Pages artifact + - name: Download temporary Pages artifact uses: actions/download-artifact@v3 with: - name: github-pages + name: github-pages-tmp path: _site/src/docs - name: Add new docs to site