From 584eea35df78575a6c7c3102c94212289d896dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=B1=D1=80=D0=B0=D0=BC=D0=BE=D0=B2=20=D0=9C=D0=B8?= =?UTF-8?q?=D1=85=D0=B0=D0=B8=D0=BB=20=28Abramov=5FMA=29?= Date: Tue, 9 Apr 2024 08:48:32 +0400 Subject: [PATCH 1/4] bsdtar 3.7.3 --- .github/workflows/bsdtar.yml | 2 +- README.md | 2 +- bsdtar/build_mingw.sh | 2 +- bsdtar/build_musl.sh | 2 +- bsdtar/test_linux.sh | 2 +- bsdtar/test_windows.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bsdtar.yml b/.github/workflows/bsdtar.yml index 690ef40d0..9cb1de620 100644 --- a/.github/workflows/bsdtar.yml +++ b/.github/workflows/bsdtar.yml @@ -55,7 +55,7 @@ jobs: uses: ./.github/workflows/release.yml with: workflow: ${{ github.workflow }} - tool_version: '3.7.1' + tool_version: '3.7.3' prepare_body: | bsdtar -Oxf ./build-musl/build-musl.tar.gz build-musl.md >> body.md bsdtar -Oxf ./build-mingw/build-mingw.tar.gz build-mingw.md >> body.md diff --git a/README.md b/README.md index eee38f793..a651a0f72 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/pylint-3.0.3/total?label=⭳%20pylint-3.0.3)](https://github.com/hemnstill/StandaloneTools/releases/tag/pylint-3.0.3) | [![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.8.0/total?label=⭳%20mypy-1.8.0)](https://github.com/hemnstill/StandaloneTools/releases/tag/mypy-1.8.0) | [![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-8.3.0/total?label=⭳%20ansible-8.3.0-core-2.15.3)](https://github.com/hemnstill/StandaloneTools/releases/tag/ansible-8.3.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.7.1/total?label=⭳%20bsdtar-3.7.1)](https://github.com/hemnstill/StandaloneTools/releases/tag/bsdtar-3.7.1) | [![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/bsdtar-3.7.3/total?label=⭳%20bsdtar-3.7.3)](https://github.com/hemnstill/StandaloneTools/releases/tag/bsdtar-3.7.3) | [![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/7-Zip-23.01/total?label=⭳%207-Zip-23.01)](https://github.com/hemnstill/StandaloneTools/releases/tag/7-Zip-23.01) | [![SourceForge Downloads](https://img.shields.io/sourceforge/dm/sevenzip?style=social&label=7-Zip)](https://sourceforge.net/projects/sevenzip/) | | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/zstd-1.5.6/total?label=⭳%20zstd-1.5.6)](https://github.com/hemnstill/StandaloneTools/releases/tag/zstd-1.5.6) | [![GitHub Repo stars](https://img.shields.io/github/stars/facebook/zstd?style=social&label=zstd)](https://github.com/facebook/zstd) [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/facebook/zstd)](https://github.com/facebook/zstd/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) | diff --git a/bsdtar/build_mingw.sh b/bsdtar/build_mingw.sh index 3c9ac56a3..66bf74a41 100755 --- a/bsdtar/build_mingw.sh +++ b/bsdtar/build_mingw.sh @@ -3,7 +3,7 @@ dp0="$(realpath "$(dirname "$0")")" set -e tool_name="bsdtar.exe" -tool_version="3.7.1" +tool_version="3.7.3" self_toolset_name="build-mingw" download_url="https://github.com/libarchive/libarchive/releases/download/v$tool_version/libarchive-$tool_version.tar.gz" diff --git a/bsdtar/build_musl.sh b/bsdtar/build_musl.sh index 948be1ffc..0b379434d 100755 --- a/bsdtar/build_musl.sh +++ b/bsdtar/build_musl.sh @@ -10,7 +10,7 @@ apk add --no-cache alpine-sdk zlib-dev zlib-static xz-dev zstd-dev zstd-static echo "::endgroup::" tool_name="bsdtar" -tool_version="3.7.1" +tool_version="3.7.3" self_toolset_name="build-musl" download_url="https://github.com/libarchive/libarchive/releases/download/v$tool_version/libarchive-$tool_version.tar.gz" diff --git a/bsdtar/test_linux.sh b/bsdtar/test_linux.sh index d9a700469..d77787931 100755 --- a/bsdtar/test_linux.sh +++ b/bsdtar/test_linux.sh @@ -1,7 +1,7 @@ #!/bin/bash testVersion() { - assertEquals "bsdtar 3.7.1 - libarchive 3.7.1 zlib/1.2.12 liblzma/5.2.5 libzstd/1.5.2 " "$(../bin/bsdtar --version)" + assertEquals "bsdtar 3.7.3 - libarchive 3.7.1 zlib/1.2.12 liblzma/5.2.5 libzstd/1.5.2 " "$(../bin/bsdtar --version)" } # Load and run shUnit2. diff --git a/bsdtar/test_windows.sh b/bsdtar/test_windows.sh index 36a9fba01..2efb15a52 100755 --- a/bsdtar/test_windows.sh +++ b/bsdtar/test_windows.sh @@ -1,7 +1,7 @@ #!/bin/bash testVersion() { - assertEquals "bsdtar 3.7.1 - libarchive 3.7.1 zlib/1.2.12 liblzma/5.2.5 libzstd/1.5.2 " "$(../bin/bsdtar.exe --version)" + assertEquals "bsdtar 3.7.3 - libarchive 3.7.1 zlib/1.2.12 liblzma/5.2.5 libzstd/1.5.2 " "$(../bin/bsdtar.exe --version)" } # Load and run shUnit2. From 7a0c23fe21f4bcb9467f1977d60c184df7d48d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=B1=D1=80=D0=B0=D0=BC=D0=BE=D0=B2=20=D0=9C=D0=B8?= =?UTF-8?q?=D1=85=D0=B0=D0=B8=D0=BB=20=28Abramov=5FMA=29?= Date: Tue, 9 Apr 2024 09:25:39 +0400 Subject: [PATCH 2/4] fix test --- bsdtar/test_linux.sh | 2 +- bsdtar/test_windows.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bsdtar/test_linux.sh b/bsdtar/test_linux.sh index d77787931..1fa59fe1a 100755 --- a/bsdtar/test_linux.sh +++ b/bsdtar/test_linux.sh @@ -1,7 +1,7 @@ #!/bin/bash testVersion() { - assertEquals "bsdtar 3.7.3 - libarchive 3.7.1 zlib/1.2.12 liblzma/5.2.5 libzstd/1.5.2 " "$(../bin/bsdtar --version)" + assertEquals "bsdtar 3.7.3 - libarchive 3.7.3 zlib/1.2.12 liblzma/5.2.5 libzstd/1.5.2 " "$(../bin/bsdtar --version)" } # Load and run shUnit2. diff --git a/bsdtar/test_windows.sh b/bsdtar/test_windows.sh index 2efb15a52..1aea0e6b1 100755 --- a/bsdtar/test_windows.sh +++ b/bsdtar/test_windows.sh @@ -1,7 +1,7 @@ #!/bin/bash testVersion() { - assertEquals "bsdtar 3.7.3 - libarchive 3.7.1 zlib/1.2.12 liblzma/5.2.5 libzstd/1.5.2 " "$(../bin/bsdtar.exe --version)" + assertEquals "bsdtar 3.7.3 - libarchive 3.7.3 zlib/1.2.12 liblzma/5.2.5 libzstd/1.5.2 " "$(../bin/bsdtar.exe --version)" } # Load and run shUnit2. From d31c32d56726bac9c8f8c613d9421060d4f71fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=B1=D1=80=D0=B0=D0=BC=D0=BE=D0=B2=20=D0=9C=D0=B8?= =?UTF-8?q?=D1=85=D0=B0=D0=B8=D0=BB=20=28Abramov=5FMA=29?= Date: Wed, 10 Apr 2024 08:28:02 +0400 Subject: [PATCH 3/4] mingw --- bsdtar/build_mingw.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsdtar/build_mingw.sh b/bsdtar/build_mingw.sh index 66bf74a41..1808256cf 100755 --- a/bsdtar/build_mingw.sh +++ b/bsdtar/build_mingw.sh @@ -17,7 +17,7 @@ ci_download_url="https://raw.githubusercontent.com/libarchive/libarchive/v$tool_ wget "$ci_download_url" -O "$dp0/ci.cmd" patch "$dp0/ci.cmd" "$dp0/release/bdstar_remove_bzip2.diff" - +choco install mingw echo "::endgroup::" echo "::group::build" From dff1c2eaf5dc81b5dba99ef90b8f4c1717bc2938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=B1=D1=80=D0=B0=D0=BC=D0=BE=D0=B2=20=D0=9C=D0=B8?= =?UTF-8?q?=D1=85=D0=B0=D0=B8=D0=BB=20=28Abramov=5FMA=29?= Date: Wed, 10 Apr 2024 08:59:28 +0400 Subject: [PATCH 4/4] win-test up --- bsdtar/test_windows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsdtar/test_windows.sh b/bsdtar/test_windows.sh index 1aea0e6b1..76ab9b166 100755 --- a/bsdtar/test_windows.sh +++ b/bsdtar/test_windows.sh @@ -1,7 +1,7 @@ #!/bin/bash testVersion() { - assertEquals "bsdtar 3.7.3 - libarchive 3.7.3 zlib/1.2.12 liblzma/5.2.5 libzstd/1.5.2 " "$(../bin/bsdtar.exe --version)" + assertEquals "bsdtar 3.7.3 - libarchive 3.7.3 zlib/1.3 liblzma/5.4.4 libzstd/1.5.6 " "$(../bin/bsdtar.exe --version)" } # Load and run shUnit2.