From 739dfa9507d4c0d913e5b0203da0cecb4ce58bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Marcos?= Date: Fri, 18 Apr 2025 03:46:39 -0300 Subject: [PATCH] Bump version to 0.6.0 --- .github/workflows/build-artifacts-and-run-tests.yml | 8 ++++---- .github/workflows/draft-release-automatic-trigger.yml | 5 ++--- CHANGELOG.md | 9 ++++++++- Cargo.lock | 2 +- Cargo.toml | 2 +- scripts/package-release-assets.sh | 9 +++++++-- 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-artifacts-and-run-tests.yml b/.github/workflows/build-artifacts-and-run-tests.yml index 5a851f7..3b84f9d 100644 --- a/.github/workflows/build-artifacts-and-run-tests.yml +++ b/.github/workflows/build-artifacts-and-run-tests.yml @@ -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 @@ -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 @@ -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: @@ -153,4 +153,4 @@ jobs: path: | target/${{ matrix.target }}/release/ouch target/${{ matrix.target }}/release/ouch.exe - artifacts/ + man-page-and-completions-artifacts/ diff --git a/.github/workflows/draft-release-automatic-trigger.yml b/.github/workflows/draft-release-automatic-trigger.yml index fd45837..24b45fc 100644 --- a/.github/workflows/draft-release-automatic-trigger.yml +++ b/.github/workflows/draft-release-automatic-trigger.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7de9463..dd50ea8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Cargo.lock b/Cargo.lock index f87245c..59bd16a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1066,7 +1066,7 @@ checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "ouch" -version = "0.5.1" +version = "0.6.0" dependencies = [ "assert_cmd", "atty", diff --git a/Cargo.toml b/Cargo.toml index 309d28e..1fe8b82 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ouch" -version = "0.5.1" +version = "0.6.0" authors = [ "João Marcos ", "Vinícius Rodrigues Miguel ", diff --git a/scripts/package-release-assets.sh b/scripts/package-release-assets.sh index 69aac6f..84d635e 100755 --- a/scripts/package-release-assets.sh +++ b/scripts/package-release-assets.sh @@ -1,8 +1,12 @@ #!/usr/bin/env bash set -e -mkdir -p output_assets +mkdir output_assets +echo "created folder 'output_assets/'" +ls -lA -w 1 cd downloaded_artifacts +echo "entered 'downloaded_artifacts/'" +ls -lA -w 1 TARGETS=( "aarch64-pc-windows-msvc" @@ -16,7 +20,8 @@ TARGETS=( "x86_64-unknown-linux-gnu" "x86_64-unknown-linux-musl" ) -DEFAULT_FEATURES="unrar+use_zlib+use_zstd_thin" +# Temporary, we'll remove allow_piped_choice later +DEFAULT_FEATURES="allow_piped_choice+unrar+use_zlib+use_zstd_thin" for target in "${TARGETS[@]}"; do input_dir="ouch-${target}-${DEFAULT_FEATURES}"