From 15e2a2622bf37b229c0b2397b1d1617504d422f7 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 16 Oct 2024 21:15:59 +0200 Subject: [PATCH 1/2] Fix package name in rebuild script. --- changelogs/fragments/636-rename.yml | 2 ++ src/antsibull_build/data/build-ansible.sh.j2 | 2 +- tests/test_data/package-files/7.5.0/build-ansible.sh | 2 +- tests/test_data/package-files/8.1.0/build-ansible.sh | 2 +- .../package-files/force_setup_cfg/8.1.0/build-ansible.sh | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/636-rename.yml diff --git a/changelogs/fragments/636-rename.yml b/changelogs/fragments/636-rename.yml new file mode 100644 index 00000000..50a2d2ea --- /dev/null +++ b/changelogs/fragments/636-rename.yml @@ -0,0 +1,2 @@ +bugfixes: + - "Adjust the rebuild script included in Ansible releases to also install antsibull-build instead of antsibull (https://github.com/ansible-community/antsibull-build/pull/636)." diff --git a/src/antsibull_build/data/build-ansible.sh.j2 b/src/antsibull_build/data/build-ansible.sh.j2 index 0cb68ef4..6e4dc12f 100644 --- a/src/antsibull_build/data/build-ansible.sh.j2 +++ b/src/antsibull_build/data/build-ansible.sh.j2 @@ -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 diff --git a/tests/test_data/package-files/7.5.0/build-ansible.sh b/tests/test_data/package-files/7.5.0/build-ansible.sh index 8582de56..c7e4cc67 100755 --- a/tests/test_data/package-files/7.5.0/build-ansible.sh +++ b/tests/test_data/package-files/7.5.0/build-ansible.sh @@ -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}" diff --git a/tests/test_data/package-files/8.1.0/build-ansible.sh b/tests/test_data/package-files/8.1.0/build-ansible.sh index 01e5f402..1f894754 100755 --- a/tests/test_data/package-files/8.1.0/build-ansible.sh +++ b/tests/test_data/package-files/8.1.0/build-ansible.sh @@ -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}" diff --git a/tests/test_data/package-files/force_setup_cfg/8.1.0/build-ansible.sh b/tests/test_data/package-files/force_setup_cfg/8.1.0/build-ansible.sh index 01e5f402..1f894754 100755 --- a/tests/test_data/package-files/force_setup_cfg/8.1.0/build-ansible.sh +++ b/tests/test_data/package-files/force_setup_cfg/8.1.0/build-ansible.sh @@ -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}" From 290253e5421aa64babb831e104b3d87c85cea99c Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 19 Oct 2024 01:01:32 +0200 Subject: [PATCH 2/2] Update changelog. Co-authored-by: Maxwell G --- changelogs/fragments/636-rename.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/fragments/636-rename.yml b/changelogs/fragments/636-rename.yml index 50a2d2ea..5a83cd76 100644 --- a/changelogs/fragments/636-rename.yml +++ b/changelogs/fragments/636-rename.yml @@ -1,2 +1,2 @@ bugfixes: - - "Adjust the rebuild script included in Ansible releases to also install antsibull-build instead of antsibull (https://github.com/ansible-community/antsibull-build/pull/636)." + - "Adjust the rebuild script included in Ansible releases to install antsibull-build instead of antsibull (https://github.com/ansible-community/antsibull-build/pull/636)."