Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix package name in rebuild script #636

Merged
merged 2 commits into from
Oct 18, 2024
Merged

Fix package name in rebuild script #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15e2a26
Fix package name in rebuild script.
felixfontein Oct 16, 2024
290253e
Update changelog.
felixfontein Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/636-rename.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- "Adjust the rebuild script included in Ansible releases to install antsibull-build instead of antsibull (https://github.com/ansible-community/antsibull-build/pull/636)."
2 changes: 1 addition & 1 deletion src/antsibull_build/data/build-ansible.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MAJOR="{{ version.major }}"
# For idempotency, remove build data or built output first
rm -rf ansible-build-data built

pip3 install --user --upgrade "antsibull=={{ antsibull_version }}"
pip3 install --user --upgrade "antsibull-build=={{ antsibull_version }}"
git clone https://github.com/ansible-community/ansible-build-data.git
mkdir -p built collection-cache

Expand Down
2 changes: 1 addition & 1 deletion tests/test_data/package-files/7.5.0/build-ansible.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ MAJOR="7"
# For idempotency, remove build data or built output first
rm -rf ansible-build-data built

pip3 install --user --upgrade "antsibull==(ANTSIBULL_VERSION)"
pip3 install --user --upgrade "antsibull-build==(ANTSIBULL_VERSION)"
git clone https://github.com/ansible-community/ansible-build-data.git
mkdir -p built collection-cache
BUILD_DATA_DIR="ansible-build-data/${MAJOR}"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_data/package-files/8.1.0/build-ansible.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ MAJOR="8"
# For idempotency, remove build data or built output first
rm -rf ansible-build-data built

pip3 install --user --upgrade "antsibull==(ANTSIBULL_VERSION)"
pip3 install --user --upgrade "antsibull-build==(ANTSIBULL_VERSION)"
git clone https://github.com/ansible-community/ansible-build-data.git
mkdir -p built collection-cache
BUILD_DATA_DIR="ansible-build-data/${MAJOR}"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_data/package-files/force_setup_cfg/8.1.0/build-ansible.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ MAJOR="8"
# For idempotency, remove build data or built output first
rm -rf ansible-build-data built

pip3 install --user --upgrade "antsibull==(ANTSIBULL_VERSION)"
pip3 install --user --upgrade "antsibull-build==(ANTSIBULL_VERSION)"
git clone https://github.com/ansible-community/ansible-build-data.git
mkdir -p built collection-cache
BUILD_DATA_DIR="ansible-build-data/${MAJOR}"
Expand Down