From d94ed62e33011b3eac410bd4d9eb68c7c6bce997 Mon Sep 17 00:00:00 2001 From: Alexandr Reshetnikov Date: Fri, 26 May 2023 08:13:27 +0400 Subject: [PATCH] ansible-7.6.0 ansible-core 2.14.6 (#62) * use `dp0="$(dirname "$(readlink -f "$0")")"` * use bsdtar --- .github/workflows/ansible.yml | 2 +- README.md | 2 +- ansible/build_gnu.sh | 11 +++-------- ansible/release/_ansible | 2 +- ansible/release/ansible-config | 2 +- ansible/release/ansible-galaxy | 2 +- ansible/release/ansible-lint | 2 +- ansible/release/ansible-playbook | 2 +- ansible/release/ansible-test | 2 +- ansible/test_docker.sh | 2 +- ansible/test_linux.sh | 14 +++++++------- 11 files changed, 19 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml index cd92c7624..649962131 100644 --- a/.github/workflows/ansible.yml +++ b/.github/workflows/ansible.yml @@ -52,7 +52,7 @@ jobs: uses: ./.github/workflows/release.yml with: workflow: ${{ github.workflow }} - tool_version: '7.5.0' + tool_version: '7.6.0' prepare_body: | bsdtar -Oxf ./build-docker/build-docker.tar.gz build-docker.md >> body.md bsdtar -Oxf ./build-gnu/build-gnu.tar.gz build-gnu.md >> body.md diff --git a/README.md b/README.md index 2eb162357..cdec24ec0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/poetry-1.5.0/total?label=⭳%20poetry-1.5.0)](https://github.com/hemnstill/StandaloneTools/releases/tag/poetry-1.5.0) | [![GitHub Repo stars](https://img.shields.io/github/stars/python-poetry/poetry?style=social&label=poetry)](https://github.com/python-poetry/poetry) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/python-poetry/poetry)](https://python-poetry.org/docs/) | | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/pylint-2.17.0/total?label=⭳%20pylint-2.17.0)](https://github.com/hemnstill/StandaloneTools/releases/tag/pylint-2.17.0) | [![GitHub Repo stars](https://img.shields.io/github/stars/PyCQA/pylint?style=social&label=pylint)](https://github.com/PyCQA/pylint) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/PyCQA/pylint)](https://pylint.pycqa.org/en/latest/) | | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/mypy-1.1.1/total?label=⭳%20mypy-1.1.1)](https://github.com/hemnstill/StandaloneTools/releases/tag/mypy-1.1.1) | [![GitHub Repo stars](https://img.shields.io/github/stars/python/mypy?style=social&label=mypy)](https://github.com/python/mypy) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/python/mypy)](https://mypy.readthedocs.io/en/latest/) | -| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/ansible-7.5.0/total?label=⭳%20ansible-7.5.0-core-2.14.5)](https://github.com/hemnstill/StandaloneTools/releases/tag/ansible-7.5.0) | [![GitHub Repo stars](https://img.shields.io/github/stars/ansible/ansible?style=social&label=ansible)](https://github.com/ansible/ansible) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/ansible/ansible)](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) | +| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/ansible-7.6.0/total?label=⭳%20ansible-7.6.0-core-2.14.6)](https://github.com/hemnstill/StandaloneTools/releases/tag/ansible-7.6.0) | [![GitHub Repo stars](https://img.shields.io/github/stars/ansible/ansible?style=social&label=ansible)](https://github.com/ansible/ansible) [![PyPI](https://img.shields.io/pypi/v/ansible)](https://pypi.org/project/ansible/) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/ansible/ansible)](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) | | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/bsdtar-3.6.2/total?label=⭳%20bsdtar-3.6.2)](https://github.com/hemnstill/StandaloneTools/releases/tag/bsdtar-3.6.2) | [![GitHub Repo stars](https://img.shields.io/github/stars/libarchive/libarchive?style=social&label=libarchive)](https://github.com/libarchive/libarchive) [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/libarchive/libarchive)](https://github.com/libarchive/libarchive/releases/latest) | | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/pg_dump-15.1/total?label=⭳%20pg_dump-15.1)](https://github.com/hemnstill/StandaloneTools/releases/tag/pg_dump-15.1) | [![GitHub Repo stars](https://img.shields.io/github/stars/postgres/postgres?style=social&label=postgres)](https://github.com/postgres/postgres) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/postgres/postgres)](https://www.postgresql.org/docs/current/index.html) | | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/busybox-1.35.0-FRP-4784/total?label=⭳%20busybox-1.35.0-FRP-4784)](https://github.com/hemnstill/StandaloneTools/releases/tag/busybox-1.35.0-FRP-4784) | [![GitHub Repo stars](https://img.shields.io/github/stars/rmyorston/busybox-w32?style=social&label=busybox-w32)](https://github.com/rmyorston/busybox-w32) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/rmyorston/busybox-w32)](https://frippery.org/busybox/release-notes/current.html) | diff --git a/ansible/build_gnu.sh b/ansible/build_gnu.sh index 34ef55674..25f6916e0 100755 --- a/ansible/build_gnu.sh +++ b/ansible/build_gnu.sh @@ -10,7 +10,7 @@ apk add --no-cache alpine-sdk python3-dev bash export LC_ALL=en_US.UTF-8 tool_name="ansible" -tool_version="7.5.0" +tool_version="7.6.0" tool_lint_version="6.16.2" python_self_name="python-3.11.3" self_name="$tool_name-$tool_version" @@ -25,14 +25,9 @@ python_bin_download_url="https://github.com/hemnstill/StandaloneTools/releases/d python_download_zip="$dp0/release/$python_self_name.tar.gz" [[ ! -f "$python_download_zip" ]] && wget "$python_bin_download_url" -O "$python_download_zip" -echo "download bsdtar ..." -bsdtar_version=3.6.2 -bsdtar_download_url="https://github.com/hemnstill/StandaloneTools/releases/download/bsdtar-$bsdtar_version/build-musl.tar.gz" -bsdtar_tar_gz="bsdtar-$bsdtar_version-build-musl.tar.gz" -[[ ! -f "$bsdtar_tar_gz" ]] && wget "$bsdtar_download_url" -O "$bsdtar_tar_gz" -tar -xf "$bsdtar_tar_gz" - +"$dp0/../.tools/download_bsdtar.sh" bsdtar="$dp0/release/bsdtar" + cpython_bin="$release_version_dirpath/Scripts/bin/python3" cpython_lib_path="$release_version_dirpath/Scripts/lib/python3.10/site-packages" [[ ! -f "$cpython_bin" ]] && "$bsdtar" -xf "$python_download_zip" -C "$release_version_dirpath" diff --git a/ansible/release/_ansible b/ansible/release/_ansible index 7ff3e38f1..449a79e68 100755 --- a/ansible/release/_ansible +++ b/ansible/release/_ansible @@ -1,3 +1,3 @@ #!/bin/bash -dp0="$(realpath "$(dirname "$0")")" +dp0="$(dirname "$(readlink -f "$0")")" "$dp0/python3" "$dp0/../../__main__ansible.py" "$@" diff --git a/ansible/release/ansible-config b/ansible/release/ansible-config index ebad99125..bddb96648 100755 --- a/ansible/release/ansible-config +++ b/ansible/release/ansible-config @@ -1,3 +1,3 @@ #!/bin/bash -dp0="$(realpath "$(dirname "$0")")" +dp0="$(dirname "$(readlink -f "$0")")" "$dp0/python3" "$dp0/../../__main__ansible-config.py" "$@" diff --git a/ansible/release/ansible-galaxy b/ansible/release/ansible-galaxy index 66f2957ed..cb2b4d51e 100755 --- a/ansible/release/ansible-galaxy +++ b/ansible/release/ansible-galaxy @@ -1,3 +1,3 @@ #!/bin/bash -dp0="$(realpath "$(dirname "$0")")" +dp0="$(dirname "$(readlink -f "$0")")" "$dp0/python3" "$dp0/../../__main__ansible-galaxy.py" "$@" diff --git a/ansible/release/ansible-lint b/ansible/release/ansible-lint index 7c14fb94b..e95945e1d 100755 --- a/ansible/release/ansible-lint +++ b/ansible/release/ansible-lint @@ -1,3 +1,3 @@ #!/bin/bash -dp0="$(realpath "$(dirname "$0")")" +dp0="$(dirname "$(readlink -f "$0")")" "$dp0/python3" "$dp0/../../__main__ansible-lint.py" "$@" diff --git a/ansible/release/ansible-playbook b/ansible/release/ansible-playbook index 5cb9d6377..5f856bdd4 100755 --- a/ansible/release/ansible-playbook +++ b/ansible/release/ansible-playbook @@ -1,3 +1,3 @@ #!/bin/bash -dp0="$(realpath "$(dirname "$0")")" +dp0="$(dirname "$(readlink -f "$0")")" "$dp0/python3" "$dp0/../../__main__ansible-playbook.py" "$@" diff --git a/ansible/release/ansible-test b/ansible/release/ansible-test index 4c839e12c..86fc96b6d 100755 --- a/ansible/release/ansible-test +++ b/ansible/release/ansible-test @@ -1,3 +1,3 @@ #!/bin/bash -dp0="$(realpath "$(dirname "$0")")" +dp0="$(dirname "$(readlink -f "$0")")" "$dp0/python3" "$dp0/../../__main__ansible-test.py" "$@" diff --git a/ansible/test_docker.sh b/ansible/test_docker.sh index 66a191ae7..5199b3220 100755 --- a/ansible/test_docker.sh +++ b/ansible/test_docker.sh @@ -23,7 +23,7 @@ test_ansible_galaxy_version() { } test_ansible_lint_version() { - assertEquals "ansible-lint 6.16.0 using ansible 2.14.5" "$(docker run --rm $image_name ansible-lint --version | head -1)" + assertEquals "ansible-lint 6.16.2 using ansible-core:2.14.5 ruamel-yaml:0.17.27 ruamel-yaml-clib:0.2.7" "$(docker run --rm $image_name ansible-lint --version | head -1)" } # Load and run shUnit2. diff --git a/ansible/test_linux.sh b/ansible/test_linux.sh index f661086fc..20dd8bdf5 100755 --- a/ansible/test_linux.sh +++ b/ansible/test_linux.sh @@ -18,7 +18,7 @@ if [[ "$is_ubuntu_os" == true ]]; then fi test_version() { - assertEquals "ansible [core 2.14.5] + assertEquals "ansible [core 2.14.6] config file = None configured module search path = ['/github/home/.ansible/plugins/modules', '/usr/share/ansible/plugins/modules'] ansible python module location = /__w/StandaloneTools/StandaloneTools/bin/Scripts/lib/python3.11/site-packages/ansible @@ -30,27 +30,27 @@ test_version() { } test_bin_version() { - assertEquals "ansible [core 2.14.5]" "$(../bin/Scripts/bin/ansible --version | head -1)" + assertEquals "ansible [core 2.14.6]" "$(../bin/Scripts/bin/ansible --version | head -1)" } test_ansible_config_version() { - assertEquals "ansible-config [core 2.14.5]" "$(../bin/Scripts/bin/ansible-config --version | head -1)" + assertEquals "ansible-config [core 2.14.6]" "$(../bin/Scripts/bin/ansible-config --version | head -1)" } test_ansible_playbook_version() { - assertEquals "ansible-playbook [core 2.14.5]" "$(../bin/Scripts/bin/ansible-playbook --version | head -1)" + assertEquals "ansible-playbook [core 2.14.6]" "$(../bin/Scripts/bin/ansible-playbook --version | head -1)" } test_ansible_galaxy_version() { - assertEquals "ansible-galaxy [core 2.14.5]" "$(../bin/Scripts/bin/ansible-galaxy --version | head -1)" + assertEquals "ansible-galaxy [core 2.14.6]" "$(../bin/Scripts/bin/ansible-galaxy --version | head -1)" } test_ansible_lint_version() { - assertEquals "ansible-lint 6.16.2 using ansible-core:2.14.5 ruamel-yaml:0.17.26 ruamel-yaml-clib:0.2.7" "$(../bin/Scripts/bin/ansible-lint --version | head -1)" + assertEquals "ansible-lint 6.16.2 using ansible-core:2.14.6 ruamel-yaml:0.17.27 ruamel-yaml-clib:0.2.7" "$(../bin/Scripts/bin/ansible-lint --version | head -1)" } test_ansible_test_version() { - assertEquals "ansible-test version 2.14.5" "$(../bin/Scripts/bin/ansible-test --version | head -1)" + assertEquals "ansible-test version 2.14.6" "$(../bin/Scripts/bin/ansible-test --version | head -1)" } # Load and run shUnit2.