Skip to content

Commit

Permalink
bsdtar 3.7.3 with zstd 1.5.6 (#106)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hemnstill
hemnstill committed Apr 10, 2024
1 parent e3a93a9 commit 4eb6180
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 15 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/bsdtar.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ jobs:
uses: ./.github/workflows/build-alpine.yml
with:
workflow: ${{ github.workflow }}
version: 3.16.6
version: 3.19.1

windows-mingw:
if: ${{ vars.CURRENT_TOOL == github.workflow }}
uses: ./.github/workflows/build-windows.yml
with:
workflow: ${{ github.workflow }}
version: 2022

test-alpine:
needs: alpine-musl
Expand Down Expand Up @@ -55,7 +56,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
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/build-windows.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ jobs:
build-windows:
runs-on: windows-${{ inputs.version }}
steps:
- name: Install OpenSSL (Windows)
if: runner.os == 'Windows'
shell: powershell
run: |
vcpkg install openssl:x64-windows
- uses: actions/checkout@v3
- name: build ${{ inputs.workflow }}-windows-${{ inputs.toolset }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion .tools/download_bsdtar.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
is_windows_os=false && [[ $(uname) == Windows_NT* || $(uname) == MINGW64_NT* ]] && is_windows_os=true

echo "download bsdtar ..."
bsdtar_version=3.7.1
bsdtar_version=3.7.3
bsdtar_toolset_name="build-musl" && [[ "$is_windows_os" == true ]] && bsdtar_toolset_name="build-mingw"

bsdtar_download_url="https://github.com/hemnstill/StandaloneTools/releases/download/bsdtar-$bsdtar_version/$bsdtar_toolset_name.tar.gz"
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
| [![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) |
| [![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/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/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) |
Expand Down
8 changes: 7 additions & 1 deletion bsdtar/build_mingw.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@
dp0="$(realpath "$(dirname "$0")")"
set -e

echo "::group::install deps"

choco install mingw

echo "::endgroup::"

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"
Expand Down
7 changes: 5 additions & 2 deletions bsdtar/build_musl.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ set -e
echo "::group::install deps"

apk update
apk add --no-cache alpine-sdk zlib-dev zlib-static xz-dev zstd-dev zstd-static

apk add --no-cache zlib-dev zlib-static xz-dev xz-static

apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main alpine-sdk 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"
Expand Down
2 changes: 1 addition & 1 deletion bsdtar/test_linux.sh
View file
Original file line number Diff line number Diff line change
@@ -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.3 zlib/1.3.1 liblzma/5.4.5 libzstd/1.5.6 " "$(../bin/bsdtar --version)"
}

# Load and run shUnit2.
Expand Down
2 changes: 1 addition & 1 deletion bsdtar/test_windows.sh
View file
Original file line number Diff line number Diff line change
@@ -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.3 zlib/1.3 liblzma/5.4.4 libzstd/1.5.6 " "$(../bin/bsdtar.exe --version)"
}

# Load and run shUnit2.
Expand Down

0 comments on commit 4eb6180

Please sign in to comment.