Merge branch 'master' into fix-ci

zip-rs · Feb 26, 2025 · 39962c1 · 39962c1
2 parents 4e1d2f6 + 57cb3a8
commit 39962c1
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 215 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -33,55 +33,30 @@ 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
     runs-on: ubuntu-latest
 
     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
     runs-on: ubuntu-latest
 
     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
@@ -1,5 +1,15 @@
 # Changelog
 
+## [2.2.3](https://github.com/zip-rs/zip2/compare/v2.2.2...v2.2.3) - 2025-02-26
+
+### <!-- 2 -->🚜 Refactor
+
+- Change the inner structure of `DateTime` (#267)
+
+### <!-- 7 -->⚙️ Miscellaneous Tasks
+
+- cargo fix --edition
+
 ## [2.2.2](https://github.com/zip-rs/zip2/compare/v2.2.1...v2.2.2) - 2024-12-16
 
 ### <!-- 1 -->🐛 Bug Fixes

diff --git 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 <git@mathijs.vd-nes.nl>",
     "Marli Frost <marli@frost.red>",

diff --git 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
@@ -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
diff --git a/security-advisories/zipadvisories.key b/security-advisories/zipadvisories.key