From 18fe35e58d18ad9bd2bc26a3662bd729341723b6 Mon Sep 17 00:00:00 2001 From: Reshetnikov Alexandr Date: Fri, 16 Aug 2024 22:38:44 +0400 Subject: [PATCH 1/3] 7-zip 24.08 --- .github/workflows/7-Zip.yml | 2 +- 7-Zip/build_mingw.sh | 2 +- 7-Zip/build_musl.sh | 2 +- 7-Zip/test_linux.sh | 2 +- 7-Zip/test_windows.sh | 2 +- README.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/7-Zip.yml b/.github/workflows/7-Zip.yml index 20e63a153..0e5b91406 100644 --- a/.github/workflows/7-Zip.yml +++ b/.github/workflows/7-Zip.yml @@ -57,7 +57,7 @@ jobs: uses: ./.github/workflows/release.yml with: workflow: ${{ github.workflow }} - tool_version: '24.07' + tool_version: '24.08' 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/7-Zip/build_mingw.sh b/7-Zip/build_mingw.sh index cefa67ee2..d0d7d24d0 100755 --- a/7-Zip/build_mingw.sh +++ b/7-Zip/build_mingw.sh @@ -3,7 +3,7 @@ dp0="$(realpath "$(dirname "$0")")" set -e tool_name="7-Zip" -tool_version="24.07" +tool_version="24.08" self_toolset_name="build-mingw" release_version_dirpath="$dp0/release/build" diff --git a/7-Zip/build_musl.sh b/7-Zip/build_musl.sh index 94061165a..779848d0c 100755 --- a/7-Zip/build_musl.sh +++ b/7-Zip/build_musl.sh @@ -10,7 +10,7 @@ apk add --no-cache alpine-sdk make linux-headers echo "::endgroup::" tool_name="7-Zip" -tool_version="24.07" +tool_version="24.08" self_toolset_name="build-musl" release_version_dirpath="$dp0/release/build" diff --git a/7-Zip/test_linux.sh b/7-Zip/test_linux.sh index 723e0fc85..af0ad7b8f 100755 --- a/7-Zip/test_linux.sh +++ b/7-Zip/test_linux.sh @@ -2,7 +2,7 @@ testVersion() { assertEquals " -7-Zip (z) 24.07 (x64) : Copyright (c) 1999-2024 Igor Pavlov : 2024-06-19" "$(../bin/7zz | head -2)" +7-Zip (z) 24.08 (x64) : Copyright (c) 1999-2024 Igor Pavlov : 2024-06-19" "$(../bin/7zz | head -2)" } # Load and run shUnit2. diff --git a/7-Zip/test_windows.sh b/7-Zip/test_windows.sh index 737f9c89c..70068955c 100755 --- a/7-Zip/test_windows.sh +++ b/7-Zip/test_windows.sh @@ -2,7 +2,7 @@ testVersion() { assertEquals " -7-Zip (z) 24.07 (x64) : Copyright (c) 1999-2024 Igor Pavlov : 2024-06-19" "$(../bin/7zz.exe | dos2unix | head -2)" +7-Zip (z) 24.08 (x64) : Copyright (c) 1999-2024 Igor Pavlov : 2024-06-19" "$(../bin/7zz.exe | dos2unix | head -2)" } # Load and run shUnit2. diff --git a/README.md b/README.md index c163d38bb..72cd5581e 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ | [![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.4/total?label=⭳%20bsdtar-3.7.4)](https://github.com/hemnstill/StandaloneTools/releases/tag/bsdtar-3.7.4) | [![GitHub Repo stars](https://img.shields.io/github/stars/libarchive/libarchive?style=social&label=libarchive)](https://github.com/libarchive/libarchive) [![latest packaged version(s)](https://repology.org/badge/latest-versions/libarchive.svg)](https://repology.org/project/libarchive/versions) | -| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/7-Zip-24.07/total?label=⭳%207-Zip-24.07)](https://github.com/hemnstill/StandaloneTools/releases/tag/7-Zip-24.07) | [![SourceForge Downloads](https://img.shields.io/sourceforge/dm/sevenzip?style=social&label=7-Zip&logo=sourceforge)](https://sourceforge.net/projects/sevenzip/) [![versions](https://repology.org/badge/latest-versions/7zip.svg)](https://repology.org/project/7zip/versions) | +| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/7-Zip-24.08/total?label=⭳%207-Zip-24.08)](https://github.com/hemnstill/StandaloneTools/releases/tag/7-Zip-24.08) | [![SourceForge Downloads](https://img.shields.io/sourceforge/dm/sevenzip?style=social&label=7-Zip&logo=sourceforge)](https://sourceforge.net/projects/sevenzip/) [![versions](https://repology.org/badge/latest-versions/7zip.svg)](https://repology.org/project/7zip/versions) | | [![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) | | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/mysql-8.4.0/total?label=⭳%20mysql-8.4.0)](https://github.com/hemnstill/StandaloneTools/releases/tag/mysql-8.4.0) | [![GitHub Repo stars](https://img.shields.io/github/stars/mysql/mysql-server?style=social&label=mysql-server)](https://github.com/mysql/mysql-server) [![latest packaged version(s)](https://repology.org/badge/latest-versions/mysql.svg)](https://repology.org/project/mysql/information) | From 280ffe20b1ced2503cfa47d97822abb43d555b6a Mon Sep 17 00:00:00 2001 From: Reshetnikov Alexandr Date: Sat, 17 Aug 2024 08:16:40 +0400 Subject: [PATCH 2/3] remove dots --- 7-Zip/build_mingw.sh | 5 ++++- 7-Zip/build_musl.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/7-Zip/build_mingw.sh b/7-Zip/build_mingw.sh index d0d7d24d0..c97c7d860 100755 --- a/7-Zip/build_mingw.sh +++ b/7-Zip/build_mingw.sh @@ -7,9 +7,12 @@ tool_version="24.08" self_toolset_name="build-mingw" release_version_dirpath="$dp0/release/build" +# shellcheck disable=SC2001 +tool_version_digits_only="$(echo $tool_version | sed -e 's/\.//g')" + mkdir -p "$release_version_dirpath" && cd "$dp0/release" -download_url="https://www.7-zip.org/a/7z2407-src.tar.xz" +download_url="https://www.7-zip.org/a/7z$tool_version_digits_only-src.tar.xz" echo "::group::prepare sources $download_url" "$dp0/../.tools/download_bsdtar.sh" diff --git a/7-Zip/build_musl.sh b/7-Zip/build_musl.sh index 779848d0c..9c01797b0 100755 --- a/7-Zip/build_musl.sh +++ b/7-Zip/build_musl.sh @@ -14,9 +14,12 @@ tool_version="24.08" self_toolset_name="build-musl" release_version_dirpath="$dp0/release/build" +# shellcheck disable=SC2001 +tool_version_digits_only="$(echo $tool_version | sed -e 's/\.//g')" + mkdir -p "$release_version_dirpath" && cd "$dp0/release" -download_url="https://www.7-zip.org/a/7z2407-src.tar.xz" +download_url="https://www.7-zip.org/a/7z$tool_version_digits_only-src.tar.xz" echo "::group::prepare sources $download_url" "$dp0/../.tools/download_bsdtar.sh" From 9716dbc72df8888375405a3dc7c5be675fc775cb Mon Sep 17 00:00:00 2001 From: Reshetnikov Alexandr Date: Sat, 17 Aug 2024 08:18:59 +0400 Subject: [PATCH 3/3] tests up --- 7-Zip/test_linux.sh | 2 +- 7-Zip/test_windows.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/7-Zip/test_linux.sh b/7-Zip/test_linux.sh index af0ad7b8f..fe116137b 100755 --- a/7-Zip/test_linux.sh +++ b/7-Zip/test_linux.sh @@ -2,7 +2,7 @@ testVersion() { assertEquals " -7-Zip (z) 24.08 (x64) : Copyright (c) 1999-2024 Igor Pavlov : 2024-06-19" "$(../bin/7zz | head -2)" +7-Zip (z) 24.08 (x64) : Copyright (c) 1999-2024 Igor Pavlov : 2024-08-11" "$(../bin/7zz | head -2)" } # Load and run shUnit2. diff --git a/7-Zip/test_windows.sh b/7-Zip/test_windows.sh index 70068955c..7772a6ae1 100755 --- a/7-Zip/test_windows.sh +++ b/7-Zip/test_windows.sh @@ -2,7 +2,7 @@ testVersion() { assertEquals " -7-Zip (z) 24.08 (x64) : Copyright (c) 1999-2024 Igor Pavlov : 2024-06-19" "$(../bin/7zz.exe | dos2unix | head -2)" +7-Zip (z) 24.08 (x64) : Copyright (c) 1999-2024 Igor Pavlov : 2024-08-11" "$(../bin/7zz.exe | dos2unix | head -2)" } # Load and run shUnit2.