From a8b82debfd689d03986636e53bd6e66699c73890 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:56:41 -0700 Subject: [PATCH] Bump actions/download-artifact from 1 to 4 in /.github/workflows (#184) --- .github/workflows/ci.yaml | 8 +++--- CHANGELOG.md | 2 ++ Cargo.toml | 2 +- flake.lock | 56 ++++++++++++++++++++------------------- flake.nix | 2 +- rust-toolchain.toml | 2 +- 6 files changed, 38 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fc7271b..b7e347c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -72,7 +72,7 @@ jobs: rust: - stable - beta - - 1.60.0 #MSRV + - 1.70.0 #MSRV fail-fast: false steps: - uses: actions/checkout@v2 @@ -116,7 +116,7 @@ jobs: args: -- --save-baseline ${{ matrix.name }} - run: critcmp --export ${{ matrix.name }} > results.json - name: Store benchmark results - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: bench-${{ matrix.name }} path: results.json @@ -132,7 +132,7 @@ jobs: - name: Cache cargo uses: Swatinem/rust-cache@v1 - name: Retrieve benchmark results - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: bench-current - name: Delete artifact @@ -141,7 +141,7 @@ jobs: name: bench-current failOnError: false - name: Retrieve benchmark results - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: bench-base - name: Delete artifact diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d02ff9..9f5b42d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- [[#184](https://github.com/IronCoreLabs/recrypt-rs/pull/184)] + - Change MSRV to Rust 1.70.0 - [[#177](https://github.com/IronCoreLabs/recrypt-rs/pull/177)] - Change MSRV to Rust 1.60.0 - [[#175](https://github.com/IronCoreLabs/recrypt-rs/pull/175)] diff --git a/Cargo.toml b/Cargo.toml index bdaa46a..544205e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ categories = ["cryptography", "algorithms"] keywords = ["cryptography", "proxy-re-encryption", "PRE", "ECC", "transform-encryption"] description = "A pure-Rust implementation of Transform Encryption, a Proxy Re-encryption scheme" edition = "2021" -rust-version = "1.60.0" +rust-version = "1.70.0" [target.'cfg(all(unix, not(target_arch = "wasm32")))'.dependencies] libc = {version = "0.2"} diff --git a/flake.lock b/flake.lock index 5a35943..d95d56a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,27 +1,15 @@ { "nodes": { "flake-utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" + "inputs": { + "systems": "systems" }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -32,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675942811, - "narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "724bfc0892363087709bd3a5a1666296759154b1", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { @@ -48,11 +36,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", + "lastModified": 1718428119, + "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", + "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", "type": "github" }, "original": { @@ -71,15 +59,14 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1676082367, - "narHash": "sha256-0eO3S+2gLODqDoloufeC99PfQ5mthuN9JADzqFXid1Y=", + "lastModified": 1725589472, + "narHash": "sha256-+OB00N6Yql/ZRQQkQ0PNnxfW2tH89DHnv29hBS7tXMM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1373567ffd13719f6b7522737b010bfc514d49b4", + "rev": "2b00881d2ff72174cffdc007238cb6bedd6e1d8e", "type": "github" }, "original": { @@ -87,6 +74,21 @@ "repo": "rust-overlay", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 0a1ce4f..3d780ac 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ buildInputs = with pkgs; [ rusttoolchain pkg-config ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.Security ]; + [ pkgs.darwin.apple_sdk.frameworks.SystemConfiguration ]; }; }); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 6dd863b..2cb44b1 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] profile = "default" -channel = "1.67.1" +channel = "1.80.1"