diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d495b1a08..dea798f77 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,25 +33,11 @@ jobs: name: 'Build and test ${{ matrix.feature_flag }}: ${{ matrix.os }}, ${{ matrix.rustalias }}' runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@master - - - name: Install Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.rust }} - override: true - - - name: Check - uses: actions-rs/cargo@v1 - with: - command: check - args: --all ${{ matrix.feature_flag }} --bins --examples + - uses: actions/checkout@v4 + - run: rustup toolchain add ${{ matrix.rust }} && rustup default ${{ matrix.rust }} - - name: Tests - uses: actions-rs/cargo@v1 - with: - command: test - args: --all ${{ matrix.feature_flag }} + - run: cargo check --all ${{ matrix.feature_flag }} --bins --examples + - run: cargo test --all ${{ matrix.feature_flag }} cargo_fmt: if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name @@ -59,17 +45,9 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true - components: rustfmt - - name: fmt - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + - run: rustup toolchain add nightly && rustup default nightly && rustup component add rustfmt + + - run: cargo fmt --all -- --check check_minimal_versions: if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name @@ -77,11 +55,8 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true + - run: rustup toolchain add nightly && rustup default nightly + - name: resolve minimal versions run: cargo -Z minimal-versions update - name: check @@ -97,22 +72,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true - components: clippy - - name: clippy - uses: actions-rs/cargo@v1 - with: - command: clippy - args: --all-targets ${{ matrix.feature_flag }} -- -D warnings - - name: docs - uses: actions-rs/cargo@v1 - with: - command: doc - args: --no-deps ${{ matrix.feature_flag }} + - run: rustup toolchain add nightly && rustup default nightly && rustup component add clippy + + - run: cargo clippy --all-targets ${{ matrix.feature_flag }} -- -D warnings + - run: cargo doc --no-deps ${{ matrix.feature_flag }} fuzz_read: runs-on: ubuntu-latest @@ -122,42 +85,21 @@ jobs: - style_and_docs steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true - - name: Install afl - uses: actions-rs/cargo@v1 - with: - command: install - args: cargo-afl + - run: rustup toolchain add nightly && rustup default nightly + + - run: cargo install cargo-afl + - name: cargo afl system-config - uses: actions-rs/cargo@v1 - with: - command: afl - args: system-config + run: cargo afl system-config - name: compile fuzz - uses: actions-rs/cargo@v1 - with: - command: afl - args: build --all-features --manifest-path ${{ github.workspace }}/fuzz_read/Cargo.toml + run: cargo afl build --all-features --manifest-path ${{ github.workspace }}/fuzz_read/Cargo.toml - name: run fuzz timeout-minutes: 70 - uses: actions-rs/cargo@v1 - with: - command: afl - args: fuzz -i ${{ github.workspace }}/fuzz_read/in -o out -V 3600 -a binary -- ${{ github.workspace }}/fuzz_read/target/debug/fuzz_read + run: cargo afl fuzz -i ${{ github.workspace }}/fuzz_read/in -o out -V 3600 -- ${{ github.workspace }}/fuzz_read/target/debug/fuzz_read - name: Minimize corpus - uses: actions-rs/cargo@v1 - with: - command: afl - args: cmin -i out/default/queue -o out_cmin -- ${{ github.workspace }}/fuzz_read/target/debug/fuzz_read + run: cargo afl cmin -i out/default/queue -o out_cmin -- ${{ github.workspace }}/fuzz_read/target/debug/fuzz_read - name: Report coverage - uses: actions-rs/cargo@v1 - with: - command: afl - args: showmap -C -i out -o map -- ${{ github.workspace }}/fuzz_read/target/debug/fuzz_read + run: cargo afl showmap -C -i out -o map -- ${{ github.workspace }}/fuzz_read/target/debug/fuzz_read - run: sudo apt install rename - name: Rename files run: | @@ -191,37 +133,19 @@ jobs: - style_and_docs steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true - - name: Install afl - uses: actions-rs/cargo@v1 - with: - command: install - args: cargo-afl + - run: rustup toolchain add nightly && rustup default nightly + + - run: cargo install cargo-afl + - name: cargo afl system-config - uses: actions-rs/cargo@v1 - with: - command: afl - args: system-config + run: cargo afl system-config - name: compile fuzz - uses: actions-rs/cargo@v1 - with: - command: afl - args: build --manifest-path ${{ github.workspace }}/fuzz_read/Cargo.toml + run: cargo afl build --manifest-path ${{ github.workspace }}/fuzz_read/Cargo.toml - name: run fuzz timeout-minutes: 70 - uses: actions-rs/cargo@v1 - with: - command: afl - args: fuzz -i ${{ github.workspace }}/fuzz_read/in -o out -V 3600 -a binary -- ${{ github.workspace }}/fuzz_read/target/debug/fuzz_read + run: cargo afl fuzz -i ${{ github.workspace }}/fuzz_read/in -o out -V 3600 -- ${{ github.workspace }}/fuzz_read/target/debug/fuzz_read - name: Report coverage - uses: actions-rs/cargo@v1 - with: - command: afl - args: showmap -C -i out -o map -- ${{ github.workspace }}/fuzz_read/target/debug/fuzz_read + run: cargo afl showmap -C -i out -o map -- ${{ github.workspace }}/fuzz_read/target/debug/fuzz_read - run: sudo apt install rename - name: Rename files run: | @@ -249,42 +173,21 @@ jobs: - style_and_docs steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true - - name: Install afl - uses: actions-rs/cargo@v1 - with: - command: install - args: cargo-afl + - run: rustup toolchain add nightly && rustup default nightly + + - run: cargo install cargo-afl + - name: cargo afl system-config - uses: actions-rs/cargo@v1 - with: - command: afl - args: system-config + run: cargo afl system-config - name: compile fuzz - uses: actions-rs/cargo@v1 - with: - command: afl - args: build --all-features --manifest-path ${{ github.workspace }}/fuzz_write/Cargo.toml + run: cargo afl build --all-features --manifest-path ${{ github.workspace }}/fuzz_write/Cargo.toml - name: run fuzz timeout-minutes: 70 - uses: actions-rs/cargo@v1 - with: - command: afl - args: fuzz -i ${{ github.workspace }}/fuzz_write/in -o out -V 3600 -a binary -x ${{ github.workspace }}/fuzz_write/fuzz.dict -- ${{ github.workspace }}/fuzz_write/target/debug/fuzz_write + run: cargo afl fuzz -i ${{ github.workspace }}/fuzz_write/in -o out -V 3600 -x ${{ github.workspace }}/fuzz_write/fuzz.dict -- ${{ github.workspace }}/fuzz_write/target/debug/fuzz_write - name: Minimize corpus - uses: actions-rs/cargo@v1 - with: - command: afl - args: cmin -i out/default/queue -o out_cmin -- ${{ github.workspace }}/fuzz_write/target/debug/fuzz_write + run: cargo afl cmin -i out/default/queue -o out_cmin -- ${{ github.workspace }}/fuzz_write/target/debug/fuzz_write - name: Report coverage - uses: actions-rs/cargo@v1 - with: - command: afl - args: showmap -C -i out -o map -- ${{ github.workspace }}/fuzz_write/target/debug/fuzz_write + run: cargo afl showmap -C -i out -o map -- ${{ github.workspace }}/fuzz_write/target/debug/fuzz_write - run: sudo apt install rename - name: Rename files run: | @@ -318,37 +221,19 @@ jobs: - style_and_docs steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true - - name: Install afl - uses: actions-rs/cargo@v1 - with: - command: install - args: cargo-afl + - run: rustup toolchain add nightly && rustup default nightly + + - run: cargo install cargo-afl + - name: cargo afl system-config - uses: actions-rs/cargo@v1 - with: - command: afl - args: system-config + run: cargo afl system-config - name: compile fuzz - uses: actions-rs/cargo@v1 - with: - command: afl - args: build --all-features --manifest-path ${{ github.workspace }}/fuzz_write/Cargo.toml + run: cargo afl build --all-features --manifest-path ${{ github.workspace }}/fuzz_write/Cargo.toml - name: run fuzz timeout-minutes: 70 - uses: actions-rs/cargo@v1 - with: - command: afl - args: fuzz -i ${{ github.workspace }}/fuzz_write/in -o out -V 3600 -a binary -x ${{ github.workspace }}/fuzz_write/fuzz.dict -- ${{ github.workspace }}/fuzz_write/target/debug/fuzz_write + run: cargo afl fuzz -i ${{ github.workspace }}/fuzz_write/in -o out -V 3600 -x ${{ github.workspace }}/fuzz_write/fuzz.dict -- ${{ github.workspace }}/fuzz_write/target/debug/fuzz_write - name: Report coverage - uses: actions-rs/cargo@v1 - with: - command: afl - args: showmap -C -i out -o map -- ${{ github.workspace }}/fuzz_write/target/debug/fuzz_write + run: cargo afl showmap -C -i out -o map -- ${{ github.workspace }}/fuzz_write/target/debug/fuzz_write - run: sudo apt install rename - name: Rename files run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index d80a42eb9..c296e4392 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [2.2.3](https://github.com/zip-rs/zip2/compare/v2.2.2...v2.2.3) - 2025-02-26 + +### 🚜 Refactor + +- Change the inner structure of `DateTime` (#267) + +### ⚙️ Miscellaneous Tasks + +- cargo fix --edition + ## [2.2.2](https://github.com/zip-rs/zip2/compare/v2.2.1...v2.2.2) - 2024-12-16 ### 🐛 Bug Fixes diff --git a/Cargo.toml b/Cargo.toml index 55eef5f25..caa380e66 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zip" -version = "2.2.2" +version = "2.2.3" authors = [ "Mathijs van de Nes ", "Marli Frost ", diff --git a/fuzz_read/Cargo.toml b/fuzz_read/Cargo.toml index 9f3e3ecc1..e3548f566 100644 --- a/fuzz_read/Cargo.toml +++ b/fuzz_read/Cargo.toml @@ -4,8 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -afl = "0.15.10" -replace_with = "0.1.7" +afl = "0.15" tikv-jemallocator = "0.6.0" [dependencies.zip] diff --git a/fuzz_write/Cargo.toml b/fuzz_write/Cargo.toml index 648b88e99..b0c02689c 100644 --- a/fuzz_write/Cargo.toml +++ b/fuzz_write/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -afl = "0.15.10" +afl = "0.15" arbitrary = { version = "1.3.2", features = ["derive"] } replace_with = "0.1.7" tikv-jemallocator = "0.6.0" diff --git a/security-advisories/README.md b/security-advisories/README.md deleted file mode 100644 index f11357fed..000000000 --- a/security-advisories/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Security Advisories for `zip` - -This folder documents the security vulnerabilities affecting the zip crate. It is currently incomplete: RustSec tracks some old vulnerabilities and you should especially ensure you're using an up-to-date version of bzip2. - -## Reporting - -This folder contains a public key ([./zipadvisories.key]) which may be used for reporting sensitive vulnerabilities to the zip maintainers. At time of writing, @plecra has the decryption key. Sending encrypted reports to marli@frost.red or via a new github issue is greatly appreciated. diff --git a/security-advisories/zipadvisories.key b/security-advisories/zipadvisories.key deleted file mode 100644 index 1e5edbf8a..000000000 --- a/security-advisories/zipadvisories.key +++ /dev/null @@ -1,42 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -=Cxca ------END PGP PUBLIC KEY BLOCK-----