From 40e87e3a8135fad0be35fa70b6dfb539be9d178a Mon Sep 17 00:00:00 2001 From: Alexandr Reshetnikov Date: Sun, 9 Jun 2024 09:29:20 -0700 Subject: [PATCH] =?UTF-8?q?pcre2grep=2010.40=20=E2=86=92=2010.44=20(#110)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pcre2grep.yml | 2 +- README.md | 2 +- pcre2grep/build_msvc.sh | 12 ++++++++---- pcre2grep/build_musl.sh | 10 +++++++--- pcre2grep/test_linux.sh | 2 +- pcre2grep/test_windows.sh | 2 +- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pcre2grep.yml b/.github/workflows/pcre2grep.yml index 3670d35e6..19e9a7736 100644 --- a/.github/workflows/pcre2grep.yml +++ b/.github/workflows/pcre2grep.yml @@ -42,7 +42,7 @@ jobs: uses: ./.github/workflows/release.yml with: workflow: ${{ github.workflow }} - tool_version: '10.40' + tool_version: '10.44' prepare_body: | bsdtar -Oxf ./build-musl/build-musl.tar.gz build-musl.md >> body.md bsdtar -Oxf ./build-msvc/build-msvc.tar.gz build-msvc.md >> body.md diff --git a/README.md b/README.md index 41a4fb343..b6e1a1f19 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/redis-7.2.4/total?label=⭳%20redis-7.2.4)](https://github.com/hemnstill/StandaloneTools/releases/tag/redis-7.2.4) | [![GitHub Repo stars](https://img.shields.io/github/stars/redis/redis?style=social&label=redis)](https://github.com/redis/redis) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/redis/redis)](https://redis.io/download/) | | [![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) | | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/far2l-2.5.3/total?label=⭳%20far2l-2.5.3)](https://github.com/hemnstill/StandaloneTools/releases/tag/far2l-2.5.3) | [![GitHub Repo stars](https://img.shields.io/github/stars/elfmz/far2l?style=social&label=far2l)](https://github.com/elfmz/far2l) [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/elfmz/far2l)](https://github.com/elfmz/far2l/releases/latest) | -| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/pcre2grep-10.40/total?label=⭳%20pcre2grep-10.40)](https://github.com/hemnstill/StandaloneTools/releases/tag/pcre2grep-10.40) | [![GitHub Repo stars](https://img.shields.io/github/stars/PCRE2Project/pcre2?style=social&label=PCRE2)](https://github.com/PCRE2Project/pcre2) [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/PCRE2Project/pcre2)](https://github.com/PCRE2Project/pcre2/releases/latest) | +| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/pcre2grep-10.44/total?label=⭳%20pcre2grep-10.44)](https://github.com/hemnstill/StandaloneTools/releases/tag/pcre2grep-10.44) | [![GitHub Repo stars](https://img.shields.io/github/stars/PCRE2Project/pcre2?style=social&label=PCRE2)](https://github.com/PCRE2Project/pcre2) [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/PCRE2Project/pcre2)](https://github.com/PCRE2Project/pcre2/releases/latest) | | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/openssl-3.0.9/total?label=⭳%20openssl-3.0.9)](https://github.com/hemnstill/StandaloneTools/releases/tag/openssl-3.0.9) | [![GitHub Repo stars](https://img.shields.io/github/stars/openssl/openssl?style=social&label=OpenSSL)](https://github.com/openssl/openssl) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/openssl/openssl)](https://www.openssl.org/news/changelog.html) | diff --git a/pcre2grep/build_msvc.sh b/pcre2grep/build_msvc.sh index fc1ba6ccb..28326d80f 100644 --- a/pcre2grep/build_msvc.sh +++ b/pcre2grep/build_msvc.sh @@ -3,7 +3,8 @@ dp0="$(realpath "$(dirname "$0")")" set -e tool_name="pcre2grep.exe" -tool_version="10.40" +tool_version="10.44" +self_toolset_name="build-msvc" download_url="https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$tool_version/pcre2-$tool_version.tar.gz" echo "::group::prepare sources $download_url" @@ -26,10 +27,13 @@ cp -f "$dp0/release/pcre2-$tool_version/build/Release/$tool_name" "$dp0/release/ cd "$dp0/release/build" -{ printf 'SHA-256: %s (msvc) -' "$(sha256sum $tool_name)" +{ printf '### %s +SHA-256: %s + +%s +' "$self_toolset_name.tar.gz" "$(sha256sum $tool_name)" "$download_url" } > build-msvc.md cat build-msvc.md -tar -czvf ../build-msvc.tar.gz . +tar -czvf "../$self_toolset_name.tar.gz" . diff --git a/pcre2grep/build_musl.sh b/pcre2grep/build_musl.sh index 3993fa43c..f519e4369 100755 --- a/pcre2grep/build_musl.sh +++ b/pcre2grep/build_musl.sh @@ -10,7 +10,8 @@ apk add --no-cache alpine-sdk pcre2-dev echo "::endgroup::" tool_name="pcre2grep" -tool_version="10.40" +tool_version="10.44" +self_toolset_name="build-musl" download_url="https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$tool_version/pcre2-$tool_version.tar.gz" echo "::group::prepare sources $download_url" @@ -36,10 +37,13 @@ strip "$tool_name" chmod +x "$tool_name" { printf '%s + +### %s SHA-256: %s -' "$("./$tool_name" --version)" "$(sha256sum $tool_name)" + +' "$("./$tool_name" --version)" "$self_toolset_name.tar.gz" "$(sha256sum $tool_name)" } > build-musl.md cat build-musl.md -tar -czvf ../build-musl.tar.gz . +tar -czvf "../$self_toolset_name.tar.gz" . diff --git a/pcre2grep/test_linux.sh b/pcre2grep/test_linux.sh index be4d95337..f30d16038 100755 --- a/pcre2grep/test_linux.sh +++ b/pcre2grep/test_linux.sh @@ -3,7 +3,7 @@ grep="../bin/pcre2grep" testVersion() { - assertEquals "pcre2grep version 10.40 2022-04-14" "$("$grep" --version)" + assertEquals "pcre2grep version 10.44 2024-06-07" "$("$grep" --version)" } testDoubleQuotesWithSpaces() { diff --git a/pcre2grep/test_windows.sh b/pcre2grep/test_windows.sh index 7564694cc..d5165b0e9 100755 --- a/pcre2grep/test_windows.sh +++ b/pcre2grep/test_windows.sh @@ -3,7 +3,7 @@ grep="../bin/pcre2grep.exe" testVersion() { - assertEquals "pcre2grep version 10.40 2022-04-14" "$("$grep" --version)" + assertEquals "pcre2grep version 10.44 2024-06-07" "$("$grep" --version)" } testDoubleQuotesWithSpaces() {