Skip to content

Commit 9b27abe

Browse files
authored
Use newer GH actions; check out all required repos; bump version numbers; remove code coverage collection (#112)
* Use newer GH actions; check out all required repos; bump version numbers * Remove code coverage collection (this repo has no code anyway).
1 parent ffc6d7d commit 9b27abe

File tree

2 files changed

+57
-33
lines changed

2 files changed

+57
-33
lines changed

.github/workflows/antsibull-build-6.yml

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,46 +11,58 @@ jobs:
1111

1212
steps:
1313
- name: Check out antsibull
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v3
1515
with:
1616
repository: ansible-community/antsibull
1717
ref: main
1818
path: antsibull
1919

20+
- name: Check out antsibull-core
21+
uses: actions/checkout@v3
22+
with:
23+
repository: ansible-community/antsibull-core
24+
ref: main
25+
path: antsibull-core
26+
27+
- name: Check out antsibull-changelog
28+
uses: actions/checkout@v3
29+
with:
30+
repository: ansible-community/antsibull-changelog
31+
ref: main
32+
path: antsibull-changelog
33+
34+
- name: Check out antsibull-docs
35+
uses: actions/checkout@v3
36+
with:
37+
repository: ansible-community/antsibull-docs
38+
ref: main
39+
path: antsibull-docs
40+
2041
- name: Pre-create build directory
2142
run: mkdir -p antsibull/build
2243

2344
# This is where the antsibull build-release role expects it by default
2445
- name: Check out ansible-build-data under antsibull build directory
25-
uses: actions/checkout@v2
46+
uses: actions/checkout@v3
2647
with:
2748
path: antsibull/build/ansible-build-data
2849

29-
- name: Set up Python 3.9
30-
uses: actions/setup-python@v2
50+
- name: Set up Python 3.10
51+
uses: actions/setup-python@v3
3152
with:
32-
python-version: 3.9
53+
python-version: '3.10'
3354

3455
- name: Install dependencies
3556
run: |
3657
python3 -m pip install --upgrade pip
3758
python3 -m pip install poetry ansible-core
3859
39-
- name: Test building ansible 6.x
60+
- name: Test building Ansible 6
4061
working-directory: antsibull
4162
run: |
4263
ansible-playbook -vv playbooks/build-single-release.yaml \
43-
-e 'antsibull_build_command="poetry run coverage run -p --source antsibull -m antsibull.cli.antsibull_build"' \
4464
-e antsibull_build_file=ansible-6.build \
45-
-e antsibull_ansible_version=6.0.0a1 \
65+
-e antsibull_ansible_version=6.99.0 \
4666
-e antsibull_data_dir="{{ antsibull_data_git_dir }}/6" \
47-
-e antsibull_ansible_git_version=milestone \
67+
-e antsibull_ansible_git_version=stable-2.13 \
4868
-e antsibull_data_reset=false
49-
50-
- name: Combine and upload coverage stats
51-
working-directory: antsibull
52-
run: |
53-
poetry run coverage combine .coverage.*
54-
poetry run coverage report
55-
poetry run coverage xml -i
56-
poetry run codecov

.github/workflows/antsibull-build-default.yml

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,56 @@ jobs:
1212

1313
steps:
1414
- name: Check out antsibull
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v3
1616
with:
1717
repository: ansible-community/antsibull
1818
ref: main
1919
path: antsibull
2020

21+
- name: Check out antsibull-core
22+
uses: actions/checkout@v3
23+
with:
24+
repository: ansible-community/antsibull-core
25+
ref: main
26+
path: antsibull-core
27+
28+
- name: Check out antsibull-changelog
29+
uses: actions/checkout@v3
30+
with:
31+
repository: ansible-community/antsibull-changelog
32+
ref: main
33+
path: antsibull-changelog
34+
35+
- name: Check out antsibull-docs
36+
uses: actions/checkout@v3
37+
with:
38+
repository: ansible-community/antsibull-docs
39+
ref: main
40+
path: antsibull-docs
41+
2142
- name: Pre-create build directory
2243
run: mkdir -p antsibull/build
2344

2445
# This is where the antsibull build-release role expects it by default
2546
- name: Check out ansible-build-data under antsibull build directory
26-
uses: actions/checkout@v2
47+
uses: actions/checkout@v3
2748
with:
2849
path: antsibull/build/ansible-build-data
2950

30-
- name: Set up Python 3.9
31-
uses: actions/setup-python@v2
51+
- name: Set up Python 3.10
52+
uses: actions/setup-python@v3
3253
with:
33-
python-version: 3.9
54+
python-version: '3.10'
3455

3556
- name: Install dependencies
3657
run: |
3758
python3 -m pip install --upgrade pip
3859
python3 -m pip install poetry ansible-core
3960
40-
# Using ansible_version as 5.10.0 since it is unreleased so new deps are generated
61+
# Using ansible_version as 5.99.0 since it is unreleased so new deps are generated
4162
- name: Test building a release with the defaults
4263
working-directory: antsibull
4364
run: |
4465
ansible-playbook -vv playbooks/build-single-release.yaml \
45-
-e 'antsibull_build_command="poetry run coverage run -p --source antsibull -m antsibull.cli.antsibull_build"' \
4666
-e antsibull_data_reset=false \
47-
-e antsibull_ansible_version=5.10.0
48-
49-
- name: Combine and upload coverage stats
50-
working-directory: antsibull
51-
run: |
52-
poetry run coverage combine .coverage.*
53-
poetry run coverage report
54-
poetry run coverage xml -i
55-
poetry run codecov
67+
-e antsibull_ansible_version=5.99.0

0 commit comments

Comments
 (0)