github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-06 11:35:45 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

Adjust CI for bzip3 feature flag

Browse Source
This commit is contained in:
João Marcos 2025-05-03 19:27:19 -03:00
parent 5056050fca
commit 26b85dda36
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/build-artifacts-and-run-tests.yml vendored
View File

@ -25,7 +25,7 @@ on:
type: boolean type: boolean
required: true required: true
artifact_upload_mode: artifact_upload_mode:
description: "Control which artifacts to upload: 'none' for no uploads, 'with_default_features' to upload only artifacts with default features (use_zlib+use_zstd_thin+unrar), or 'all' to upload all feature combinations." description: "Control which artifacts to upload: 'none' for no uploads, 'with_default_features' to upload only artifacts with default features (use_zlib+use_zstd_thin+unrar+bzip3), or 'all' to upload all feature combinations."
type: string type: string
required: true required: true
@ -37,7 +37,8 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
feature-unrar: ${{ inputs.matrix_all_combinations && fromJSON('[true, false]') || fromJSON('[false]')}} feature-unrar: ${{ inputs.matrix_all_combinations && fromJSON('[true, false]') || fromJSON('[true]')}}
feature-bzip3: ${{ inputs.matrix_all_combinations && fromJSON('[true, false]') || fromJSON('[true]')}}
feature-use-zlib: ${{ inputs.matrix_all_combinations && fromJSON('[true, false]') || fromJSON('[false]')}} feature-use-zlib: ${{ inputs.matrix_all_combinations && fromJSON('[true, false]') || fromJSON('[false]')}}
feature-use-zstd-thin: ${{ inputs.matrix_all_combinations && fromJSON('[true, false]') || fromJSON('[false]')}} feature-use-zstd-thin: ${{ inputs.matrix_all_combinations && fromJSON('[true, false]') || fromJSON('[false]')}}
target: target:
@ -76,12 +77,14 @@ jobs:
- target: armv7-unknown-linux-musleabihf - target: armv7-unknown-linux-musleabihf
use-cross: true use-cross: true
# features (unless `matrix_all_combinations` is true, we only run these on linux-gnu) # features (unless `matrix_all_combinations` is true, we only run these on linux-gnu)
- feature-unrar: true - feature-unrar: false
target: x86_64-unknown-linux-gnu target: x86_64-unknown-linux-gnu
- feature-use-zlib: true - feature-use-zlib: true
target: x86_64-unknown-linux-gnu target: x86_64-unknown-linux-gnu
- feature-use-zstd-thin: true - feature-use-zstd-thin: true
target: x86_64-unknown-linux-gnu target: x86_64-unknown-linux-gnu
- feature-bzip3: false
target: x86_64-unknown-linux-gnu
steps: steps:
- name: Checkout - name: Checkout
@ -105,6 +108,7 @@ jobs:
if [[ "${{ matrix.feature-unrar }}" == true ]]; then FEATURES+=(unrar); fi if [[ "${{ matrix.feature-unrar }}" == true ]]; then FEATURES+=(unrar); fi
if [[ "${{ matrix.feature-use-zlib }}" == true ]]; then FEATURES+=(use_zlib); fi if [[ "${{ matrix.feature-use-zlib }}" == true ]]; then FEATURES+=(use_zlib); fi
if [[ "${{ matrix.feature-use-zstd-thin }}" == true ]]; then FEATURES+=(use_zstd_thin); fi if [[ "${{ matrix.feature-use-zstd-thin }}" == true ]]; then FEATURES+=(use_zstd_thin); fi
if [[ "${{ matrix.feature-bzip3 }}" == true ]]; then FEATURES+=(bzip3); fi
# Output plus-separated list for artifact names # Output plus-separated list for artifact names
IFS='+' IFS='+'
echo "FEATURES_PLUS=${FEATURES[*]}" >> $GITHUB_OUTPUT echo "FEATURES_PLUS=${FEATURES[*]}" >> $GITHUB_OUTPUT
@ -127,7 +131,7 @@ jobs:
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
with: with:
key: "${{ matrix.target }}-${{ matrix.feature-unrar }}-${{ matrix.feature-use-zlib }}-${{ matrix.feature-use-zstd-thin }}" key: "${{ matrix.target }}-${{ matrix.feature-unrar }}-${{ matrix.feature-use-zlib }}-${{ matrix.feature-use-zstd-thin }}-${{ matrix.feature-bzip3 }}"
- name: Test on stable - name: Test on stable
# there's no way to run tests for ARM64 Windows for now # there's no way to run tests for ARM64 Windows for now
@ -146,7 +150,7 @@ jobs:
if: | if: |
${{ inputs.artifact_upload_mode != 'none' && ${{ inputs.artifact_upload_mode != 'none' &&
(inputs.artifact_upload_mode == 'all' || (inputs.artifact_upload_mode == 'all' ||
(matrix.feature-unrar && matrix.feature-use-zlib && matrix.feature-use-zstd-thin)) }} (matrix.feature-unrar && matrix.feature-use-zlib && matrix.feature-use-zstd-thin && matrix.feature-bzip3)) }}
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: ouch-${{ matrix.target }}${{ steps.concat-features.outputs.FEATURES_PLUS != '' && format('-{0}', steps.concat-features.outputs.FEATURES_PLUS) || '' }} name: ouch-${{ matrix.target }}${{ steps.concat-features.outputs.FEATURES_PLUS != '' && format('-{0}', steps.concat-features.outputs.FEATURES_PLUS) || '' }}

2
scripts/package-release-assets.sh
View File

@ -21,7 +21,7 @@ PLATFORMS=(
"x86_64-unknown-linux-musl" "x86_64-unknown-linux-musl"
) )
# TODO: remove allow_piped_choice later # TODO: remove allow_piped_choice later
DEFAULT_FEATURES="allow_piped_choice+unrar+use_zlib+use_zstd_thin" DEFAULT_FEATURES="allow_piped_choice+unrar+use_zlib+use_zstd_thin+bzip3"
for platform in "${PLATFORMS[@]}"; do for platform in "${PLATFORMS[@]}"; do
path="ouch-${platform}" path="ouch-${platform}"