Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/build-artifacts-and-run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ jobs:
strategy:
fail-fast: false
matrix:
feature-unrar: ${{ 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-unrar: ${{ inputs.matrix_all_combinations && fromJSON('[true, false]') || fromJSON('[true]')}}
feature-use-zlib: ${{ inputs.matrix_all_combinations && fromJSON('[true, false]') || fromJSON('[true]')}}
feature-use-zstd-thin: ${{ inputs.matrix_all_combinations && fromJSON('[true, false]') || fromJSON('[true]')}}
target:
# native
- x86_64-unknown-linux-gnu
Expand Down Expand Up @@ -75,12 +75,12 @@ jobs:
use-cross: true
- target: armv7-unknown-linux-musleabihf
use-cross: true
# features (unless `matrix_all_combinations` is true, we only run these on linux-gnu)
- feature-unrar: true
# features (unless `matrix_all_combinations` is true, we'll only run with these disabled on linux-gnu)
- feature-unrar: false
target: x86_64-unknown-linux-gnu
- feature-use-zlib: true
- feature-use-zlib: false
target: x86_64-unknown-linux-gnu
- feature-use-zstd-thin: true
- feature-use-zstd-thin: false
target: x86_64-unknown-linux-gnu

steps:
Expand All @@ -102,9 +102,9 @@ jobs:
shell: bash
run: |
FEATURES=(allow_piped_choice)
if [[ "${{ matrix.feature-unrar }}" == true ]]; then FEATURES+=(unrar); 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-unrar }}" == true ]]; then FEATURES+=(unrar); fi
# Output plus-separated list for artifact names
IFS='+'
echo "FEATURES_PLUS=${FEATURES[*]}" >> $GITHUB_OUTPUT
Expand All @@ -127,7 +127,7 @@ jobs:

- uses: Swatinem/rust-cache@v2
with:
key: "${{ matrix.target }}-${{ matrix.feature-unrar }}-${{ matrix.feature-use-zstd-thin }}-${{ matrix.feature-unrar }}"
key: "${{ matrix.target }}-${{ matrix.feature-unrar }}-${{ matrix.feature-use-zlib }}-${{ matrix.feature-use-zstd-thin }}"

- name: Test on stable
# there's no way to run tests for ARM64 Windows for now
Expand All @@ -136,7 +136,7 @@ jobs:
${{ env.CARGO }} +stable test --profile fast --target ${{ matrix.target }} $EXTRA_CARGO_FLAGS

- name: Build release artifacts (binary and completions)
if: ${{ inputs.upload_artifacts }}
if: ${{ inputs.artifact_upload_mode != 'none' }}
run: |
${{ env.CARGO }} +stable build --release --target ${{ matrix.target }} $EXTRA_CARGO_FLAGS
env:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/draft-release-automatic-trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ jobs:
uses: actions/checkout@v4

- name: Download artifacts
uses: dawidd6/action-download-artifact@v6
uses: actions/download-artifact@v4
with:
path: downloaded_artifacts
workflow: ./.github/workflows/build-artifacts-and-run-tests.yml
name: ouch-*
pattern: ouch-*

- name: Package release assets
run: scripts/package-release-assets.sh
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@ Categories Used:

**Bullet points in chronological order by PR**

## [Unreleased](https://github.com/ouch-org/ouch/compare/0.5.1...HEAD)
## [Unreleased](https://github.com/ouch-org/ouch/compare/0.6.0...HEAD)

### New Features
### Improvements
### Bug Fixes
### Tweaks

## [0.6.0](https://github.com/ouch-org/ouch/compare/0.5.1...0.6.0)

### New Features

Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ouch"
version = "0.5.1"
version = "0.6.0"
authors = [
"João Marcos <[email protected]>",
"Vinícius Rodrigues Miguel <[email protected]>",
Expand Down
Loading