Skip to content

Commit e14e85e

Browse files
authored
Change antsibull to antsibull-docs. (#31)
1 parent 2f6c8b8 commit e14e85e

File tree

5 files changed

+25
-24
lines changed

5 files changed

+25
-24
lines changed

.github/workflows/_shared-docs-build-pr.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ on:
3636
required: false
3737
type: boolean
3838
default: false
39-
init-antsibull-version:
39+
init-antsibull-docs-version:
4040
description: |
41-
The version of antsibull to use during build init. Has no effect if init-dest-dir is supplied.
42-
If not supplied, the latest version from PyPI is used. If supplied, must be a git ref from the antsibull repository.
41+
The version of antsibull-docs to use during build init. Has no effect if init-dest-dir is supplied.
42+
If not supplied, the latest version from PyPI is used. If supplied, must be a git ref from the antsibull-docs repository.
4343
required: false
4444
type: string
4545
artifact-name:
@@ -209,7 +209,7 @@ jobs:
209209
collections: ${{ inputs.collection-name }}
210210
dest-dir: ${{ steps.vars.outputs.init-dir-base }}
211211
skip-init: ${{ steps.vars.outputs.skip-init }}
212-
antsibull-version: '${{ inputs.init-antsibull-version }}'
212+
antsibull-docs-version: '${{ inputs.init-antsibull-docs-version }}'
213213
lenient: ${{ inputs.init-lenient }}
214214
fail-on-error: ${{ inputs.init-fail-on-error }}
215215

@@ -241,7 +241,7 @@ jobs:
241241
collections: ${{ inputs.collection-name }}
242242
dest-dir: ${{ steps.vars.outputs.init-dir-head }}
243243
skip-init: ${{ steps.vars.outputs.skip-init }}
244-
antsibull-version: '${{ inputs.init-antsibull-version }}'
244+
antsibull-docs-version: '${{ inputs.init-antsibull-docs-version }}'
245245
lenient: ${{ inputs.init-lenient }}
246246
fail-on-error: ${{ inputs.init-fail-on-error }}
247247

.github/workflows/_shared-docs-build-push.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ on:
3636
required: false
3737
type: boolean
3838
default: false
39-
init-antsibull-version:
39+
init-antsibull-docs-version:
4040
description: |
41-
The version of antsibull to use during build init. Has no effect if init-dest-dir is supplied.
42-
If not supplied, the latest version from PyPI is used. If supplied, must be a git ref from the antsibull repository.
41+
The version of antsibull-docs to use during build init. Has no effect if init-dest-dir is supplied.
42+
If not supplied, the latest version from PyPI is used. If supplied, must be a git ref from the antsibull-docs repository.
4343
required: false
4444
type: string
4545
artifact-name:
@@ -121,7 +121,7 @@ jobs:
121121
collections: ${{ steps.vars.outputs.col-name }}
122122
dest-dir: ${{ steps.vars.outputs.init-dir }}
123123
skip-init: ${{ steps.vars.outputs.skip-init }}
124-
antsibull-version: '${{ inputs.init-antsibull-version }}'
124+
antsibull-docs-version: '${{ inputs.init-antsibull-docs-version }}'
125125
lenient: ${{ inputs.init-lenient }}
126126
fail-on-error: ${{ inputs.init-fail-on-error }}
127127

.github/workflows/test-action-build-init.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
tests:
17-
name: Init [ver=${{ matrix.antsibull-version }}, skip=${{ matrix.skip-init }}, lenient=${{ matrix.lenient }}, fail-on-error=${{ matrix.fail-on-error }}, dest=${{ matrix.dest }}, collections=${{ matrix.collections }}]
17+
name: Init [ver=${{ matrix.antsibull-docs-version }}, skip=${{ matrix.skip-init }}, lenient=${{ matrix.lenient }}, fail-on-error=${{ matrix.fail-on-error }}, dest=${{ matrix.dest }}, collections=${{ matrix.collections }}]
1818
runs-on: ubuntu-latest
1919
strategy:
2020
fail-fast: false
@@ -25,8 +25,9 @@ jobs:
2525
- 'fake.collection'
2626
- 'first.collection second.collection'
2727
dest: ['']
28-
antsibull-version:
28+
antsibull-docs-version:
2929
- '' # there is no default so this will be ok
30+
- 1.0.0
3031
- main
3132
lenient:
3233
- true
@@ -63,7 +64,7 @@ jobs:
6364
# please keep in sync!
6465
dest-dir: ${{ matrix.dest || format('{0}/{1}', runner.temp, '/docsbuild') }}
6566
skip-init: ${{ matrix.skip-init }}
66-
antsibull-version: ${{ matrix.antsibull-version }}
67+
antsibull-docs-version: ${{ matrix.antsibull-docs-version }}
6768
lenient: ${{ matrix.lenient }}
6869

6970
- name: assert

.test/simple-build/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
antsibull
1+
antsibull-docs
22
ansible-pygments
33
sphinx
44
sphinx-ansible-theme
55

66
# This is a package that is not likely to be installed as a dependency
7-
# of antsibull (which is usually used to generate this file),
7+
# of antsibull-docs (which is usually used to generate this file),
88
# so that we can test that the additional requirements install worked.
99
# Suggestions for a better candidate package are welcome!
1010
hvac

actions/ansible-docs-build-init/action.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ inputs:
1515
skip-init:
1616
description: |
1717
If 'true', dest-dir will be assumed to already be initialized, so this action will only install
18-
antsibull and the contents of the requirements.txt file in dest-dir.
18+
antsibull-docs and the contents of the requirements.txt file in dest-dir.
1919
required: false
2020
default: 'false'
2121
fail-on-error:
2222
description: |
23-
Corresponds to the --fail-on-error flag in antsibull. Fails if plugins cannot be parsed.
23+
Corresponds to the --fail-on-error flag in antsibull-docs. Fails if plugins cannot be parsed.
2424
Has no effect if skip-init is true.
2525
required: false
2626
default: 'false'
2727
lenient:
2828
description: |
29-
Corresponds to the --lenient flag for antsibull sphinx-init.
29+
Corresponds to the --lenient flag for antsibull-docs sphinx-init.
3030
By default, the build process will fail on warnings unless this is set to 'true'.
3131
Has no effect if skip-init is true.
3232
required: false
3333
default: 'false'
34-
antsibull-version:
34+
antsibull-docs-version:
3535
description: |
36-
The version of antsibull to install. When set, it refers to a git ref from which to install.
36+
The version of antsibull-docs to install. When set, it refers to a git ref from which to install.
3737
If not set, the latest version from PyPI is installed.
3838
required: false
3939
outputs:
@@ -47,17 +47,17 @@ outputs:
4747
runs:
4848
using: composite
4949
steps:
50-
- name: Install Antsibull and Initialize Sphinx
50+
- name: Install antsibull-docs and Initialize Sphinx
5151
id: init
5252
env:
5353
PIP_DISABLE_PIP_VERSION_CHECK: '1'
5454
shell: bash
5555
run: |
56-
echo "::group::Installing Antsibull"
57-
if [[ "${{ inputs.antsibull-version }}" != "" ]] ; then
58-
pip install https://github.com/ansible-community/antsibull/archive/${{ inputs.antsibull-version }}.tar.gz
56+
echo "::group::Installing antsibull-docs"
57+
if [[ "${{ inputs.antsibull-docs-version }}" != "" ]] ; then
58+
pip install https://github.com/ansible-community/antsibull-docs/archive/${{ inputs.antsibull-docs-version }}.tar.gz
5959
else
60-
pip install antsibull
60+
pip install antsibull-docs
6161
fi
6262
antsibull-docs --version
6363
echo "::endgroup::"

0 commit comments

Comments
 (0)