diff --git a/.github/workflows/busybox.yml b/.github/workflows/busybox.yml index 6b0146d3d..dc49f395d 100644 --- a/.github/workflows/busybox.yml +++ b/.github/workflows/busybox.yml @@ -8,6 +8,7 @@ jobs: uses: ./.github/workflows/build-alpine.yml with: workflow: ${{ github.workflow }} + version: 3.19.2 alpine-mingw: if: ${{ vars.CURRENT_TOOL == github.workflow }} @@ -55,10 +56,11 @@ jobs: uses: ./.github/workflows/release.yml with: workflow: ${{ github.workflow }} - tool_version: '1.35.0-FRP-4784' + tool_version: '1.37.0-FRP-5398' prepare_body: | - bsdtar -Oxf ./build-musl/build-musl.tar.gz build-musl.md >> body.md + cat ./test-build-mingw/test-windows.md >> body.md bsdtar -Oxf ./build-mingw/build-mingw.tar.gz build-mingw.md >> body.md + bsdtar -Oxf ./build-musl/build-musl.tar.gz build-musl.md >> body.md artifacts: ./build-musl/build-musl.tar.gz, ./build-mingw/build-mingw.tar.gz secrets: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index c698388e3..86fd259e3 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -24,3 +24,7 @@ jobs: cd ./${{ inputs.workflow }} ../.tools/busybox64.exe bash ./test_windows.sh + - uses: actions/upload-artifact@v3 + with: + name: test-${{ inputs.artifact }} + path: ./${{ inputs.workflow }}/test-windows.md diff --git a/README.md b/README.md index b6e1a1f19..eecea8799 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ | [![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.3.0/total?label=⭳%20mysql-8.3.0)](https://github.com/hemnstill/StandaloneTools/releases/tag/mysql-8.3.0) | [![GitHub Repo stars](https://img.shields.io/github/stars/mysql/mysql-server?style=social&label=mysql-server)](https://github.com/mysql/mysql-server) [![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/mysql/mysql-server)](https://dev.mysql.com/doc/relnotes/mysql/en/) | | [![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/busybox-1.37.0-FRP-5398/total?label=⭳%20busybox-1.37.0-FRP-5398)](https://github.com/hemnstill/StandaloneTools/releases/tag/busybox-1.37.0-FRP-5398) | [![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) [![latest packaged version(s)](https://repology.org/badge/latest-versions/busybox.svg)](https://repology.org/project/busybox/information) | | [![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.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/busybox/build_mingw.sh b/busybox/build_mingw.sh index e8ce6cd01..63551ed4b 100755 --- a/busybox/build_mingw.sh +++ b/busybox/build_mingw.sh @@ -11,7 +11,7 @@ echo "::endgroup::" tool_name="busybox.exe" # version_tests: no_tool_version -tool_version="FRP-4784-g5507c8744" +tool_version="FRP-5398-g89ae34445" download_url="https://github.com/rmyorston/busybox-w32/archive/refs/tags/$tool_version.tar.gz" echo "::group::prepare sources $download_url" diff --git a/busybox/build_musl.sh b/busybox/build_musl.sh index f70187cd2..3f79f8dd0 100755 --- a/busybox/build_musl.sh +++ b/busybox/build_musl.sh @@ -11,7 +11,7 @@ echo "::endgroup::" tool_name="busybox" # version_tests: no_tool_version -tool_version="1.35.0" +tool_version="1.36.1" download_url="https://busybox.net/downloads/busybox-$tool_version.tar.bz2" echo "::group::prepare sources $download_url" @@ -36,13 +36,10 @@ cd "$dp0/release/build" strip "./$tool_name" -{ printf '``` -%s -``` - +{ printf ' SHA-256: %s %s -' "$(./$tool_name)" "$(sha256sum $tool_name)" "$download_url" +' "$(sha256sum $tool_name)" "$download_url" } > build-musl.md cat build-musl.md diff --git a/busybox/test_linux.sh b/busybox/test_linux.sh index 97090c65c..503ca1eb7 100755 --- a/busybox/test_linux.sh +++ b/busybox/test_linux.sh @@ -1,7 +1,7 @@ #!/bin/bash testVersion() { - assertEquals "tar (busybox) 1.35.0" "$(../bin/busybox tar --version | head -1)" + assertEquals "tar (busybox) 1.36.1" "$(../bin/busybox tar --version | head -1)" } # Load and run shUnit2. diff --git a/busybox/test_windows.sh b/busybox/test_windows.sh index e24c5d1ef..cc4594c3e 100755 --- a/busybox/test_windows.sh +++ b/busybox/test_windows.sh @@ -1,7 +1,15 @@ #!/bin/bash testVersion() { - assertEquals "tar (busybox) 1.36.0.git" "$(../bin/busybox.exe tar --version | head -1)" + assertEquals "tar (busybox) 1.37.0.git-5398-g89ae34445" "$(../bin/busybox.exe tar --version | head -1)" + + { printf '``` +%s +``` + +' "$(../bin/busybox.exe)" + } > ./test-windows.md + } # Load and run shUnit2.