Skip to content

Commit 985e705

Browse files
committed
Update hexdoc-dev/actions refs and add merge arg to deploy-pages
1 parent ae916f7 commit 985e705

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/hexdoc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ jobs:
6060
steps:
6161
- uses: actions/checkout@v4
6262

63-
- uses: hexdoc-dev/actions/setup@v0
63+
- uses: hexdoc-dev/actions/setup@v1
6464
with:
6565
python-version: ${{ inputs.python-version }}
6666
pip-extras: ${{ inputs.pip-extras }}
6767
pip-args: ${{ inputs.pip-args }}
6868

6969
- id: build
70-
uses: hexdoc-dev/actions/build@v0
70+
uses: hexdoc-dev/actions/build@v1
7171
env:
7272
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
7373
with:
@@ -88,13 +88,13 @@ jobs:
8888
steps:
8989
- uses: actions/checkout@v4
9090

91-
- uses: hexdoc-dev/actions/setup@v0
91+
- uses: hexdoc-dev/actions/setup@v1
9292
with:
9393
python-version: ${{ inputs.python-version }}
9494
pip-extras: ${{ inputs.pip-extras }}
9595
pip-args: ${{ inputs.pip-args }}
9696

97-
- uses: hexdoc-dev/actions/deploy-pages@v0
97+
- uses: hexdoc-dev/actions/deploy-pages@v1
9898
env:
9999
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
100100
with:

deploy-pages/action.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,17 @@ inputs:
2323
description: Name of the branch used for GitHub Pages
2424
required: false
2525
default: gh-pages
26+
merge:
27+
description: "Boolean: if hexdoc-dev/actions/merge should be automatically run. Defaults to 'true'. Set to 'false' if you want to use a specific version of that action"
28+
required: false
29+
default: 'true'
2630

2731
runs:
2832
using: composite
2933
steps:
30-
- uses: hexdoc-dev/actions/merge@v0
34+
# TODO: https://github.com/orgs/community/discussions/41927
35+
- if: inputs.merge == true
36+
uses: hexdoc-dev/actions/merge@v1
3137
with:
3238
release: ${{ inputs.release }}
3339
props: ${{ inputs.props }}

0 commit comments

Comments
 (0)