Update MSRV to 1.60, add nix flake (#177)

* Add nix flake * Update gitignore * Add nix flake * Update to our toolchain action * Update to our toolchain action * Bump MSRV to 1.60 and remove deprecated toolchain args * Rust format component is needed * Fully specify rust version * Update changelog
IronCoreLabs · Feb 13, 2023 · fe4cc15 · fe4cc15
1 parent 8e6c621
commit fe4cc15
Show file tree

Hide file tree

Showing 8 changed files with 258 additions and 138 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - main
+    - main
   pull_request:
 
 name: CI
@@ -12,22 +12,20 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - name: Cache cargo
-        uses: Swatinem/rust-cache@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-      - name: Cancel workflow
-        if: failure()
-        uses: andymckay/[email protected]
+    - uses: actions/checkout@v3
+    - name: Cache cargo
+      uses: Swatinem/rust-cache@v1
+    - uses: IronCoreLabs/rust-toolchain@v1
+      with:
+        toolchain: nightly
+        components: rustfmt
+    - uses: actions-rs/cargo@v1
+      with:
+        command: fmt
+        args: --all -- --check
+    - name: Cancel workflow
+      if: failure()
+      uses: andymckay/[email protected]
 
   # Build on all the architectures we intend to support, including cross compiled ones.
   build:
@@ -36,35 +34,34 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-22.04
-            target: aarch64-linux-android # Android x64
-          - os: ubuntu-22.04
-            target: x86_64-unknown-linux-musl # Alpine Linux x86_64
-          - os: ubuntu-22.04
-            target: wasm32-unknown-unknown
-            features: --features wasm --no-default-features
-          - os: macos-12
-            target: aarch64-apple-ios
-          - os: macos-12
-            target: x86_64-apple-darwin # 64-bit OSX
-          - os: macos-12
-            target: aarch64-apple-darwin # 64-bit M1 OSX
-          - os: windows-2019
-            target: x86_64-pc-windows-msvc
+        - os: ubuntu-22.04
+          target: aarch64-linux-android # Android x64
+        - os: ubuntu-22.04
+          target: x86_64-unknown-linux-musl # Alpine Linux x86_64
+        - os: ubuntu-22.04
+          target: wasm32-unknown-unknown
+          features: --features wasm --no-default-features
+        - os: macos-12
+          target: aarch64-apple-ios
+        - os: macos-12
+          target: x86_64-apple-darwin # 64-bit OSX
+        - os: macos-12
+          target: aarch64-apple-darwin # 64-bit M1 OSX
+        - os: windows-2019
+          target: x86_64-pc-windows-msvc
     steps:
-      - uses: actions/checkout@v2
-      - name: Cache cargo
-        uses: Swatinem/rust-cache@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: ${{ matrix.target }}
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          use-cross: true
-          command: build
-          args: --release --target=${{ matrix.target }} ${{ matrix.features }}
+    - uses: actions/checkout@v2
+    - name: Cache cargo
+      uses: Swatinem/rust-cache@v1
+    - uses: IronCoreLabs/rust-toolchain@v1
+      with:
+        toolchain: stable
+        target: ${{ matrix.target }}
+    - uses: actions-rs/cargo@v1
+      with:
+        use-cross: true
+        command: build
+        args: --release --target=${{ matrix.target }} ${{ matrix.features }}
 
   # Run the tests on only one architecture, against various Rust versions.
   test:
@@ -73,22 +70,20 @@ jobs:
     strategy:
       matrix:
         rust:
-          - stable
-          - beta
-          - 1.57 #MSRV
+        - stable
+        - beta
+        - 1.60.0 #MSRV
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
-      - name: Cache cargo
-        uses: Swatinem/rust-cache@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
+    - uses: actions/checkout@v2
+    - name: Cache cargo
+      uses: Swatinem/rust-cache@v1
+    - uses: IronCoreLabs/rust-toolchain@v1
+      with:
+        toolchain: ${{ matrix.rust }}
+    - uses: actions-rs/cargo@v1
+      with:
+        command: test
 
   # Benchmark current and base revisions, if this is a PR.
   bench:
@@ -98,87 +93,83 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: current
-            ref: ${{ github.ref }}
-          - name: base
-            ref: ${{ github.base_ref }}
+        - name: current
+          ref: ${{ github.ref }}
+        - name: base
+          ref: ${{ github.base_ref }}
     steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ matrix.ref }}
-      - name: Cache cargo
-        uses: Swatinem/rust-cache@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: critcmp
-      - uses: actions-rs/cargo@v1
-        with:
-          command: bench
-          args: -- --save-baseline ${{ matrix.name }}
-      - run: critcmp --export ${{ matrix.name }} > results.json
-      - name: Store benchmark results
-        uses: actions/upload-artifact@v1
-        with:
-          name: bench-${{ matrix.name }}
-          path: results.json
+    - uses: actions/checkout@v2
+      with:
+        ref: ${{ matrix.ref }}
+    - name: Cache cargo
+      uses: Swatinem/rust-cache@v1
+    - uses: IronCoreLabs/rust-toolchain@v1
+      with:
+        toolchain: stable
+    - uses: actions-rs/cargo@v1
+      with:
+        command: install
+        args: critcmp
+    - uses: actions-rs/cargo@v1
+      with:
+        command: bench
+        args: -- --save-baseline ${{ matrix.name }}
+    - run: critcmp --export ${{ matrix.name }} > results.json
+    - name: Store benchmark results
+      uses: actions/upload-artifact@v1
+      with:
+        name: bench-${{ matrix.name }}
+        path: results.json
 
   # Add a comment to the PR with benchmark results. Only if everything else passed, and this is a PR.
   bench_results:
     needs:
-      - bench
+    - bench
     name: Upload benchmark results
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - name: Cache cargo
-        uses: Swatinem/rust-cache@v1
-      - name: Retrieve benchmark results
-        uses: actions/download-artifact@v1
-        with:
-          name: bench-current
-      - name: Delete artifact
-        uses: geekyeggo/delete-artifact@v1
-        with:
-          name: bench-current
-          failOnError: false
-      - name: Retrieve benchmark results
-        uses: actions/download-artifact@v1
-        with:
-          name: bench-base
-      - name: Delete artifact
-        uses: geekyeggo/delete-artifact@v1
-        with:
-          name: bench-base
-          failOnError: false
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: critcmp
-      - name: Compare benchmarks
-        run: |
-          if ! critcmp bench-base/results.json bench-current/results.json -t 10 ; then
-            echo "# Benchmark blew big budget! Bad!" > comment.md
-          fi
-          echo "Benchmark results comparing with base:" >> comment.md
-          echo '```' >> comment.md
-          critcmp bench-base/results.json bench-current/results.json -t 2 >> comment.md || true
-          echo '```' >> comment.md
-          cat comment.md
-          mv comment.md .github/workflows/comment.md
-      # This will post a comment to the PR with benchmark results, but it's disabled because it's annoying.
-      # - uses: harupy/comment-on-pr@c0522c4
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     filename: comment.md
+    - uses: actions/checkout@v2
+    - name: Cache cargo
+      uses: Swatinem/rust-cache@v1
+    - name: Retrieve benchmark results
+      uses: actions/download-artifact@v1
+      with:
+        name: bench-current
+    - name: Delete artifact
+      uses: geekyeggo/delete-artifact@v1
+      with:
+        name: bench-current
+        failOnError: false
+    - name: Retrieve benchmark results
+      uses: actions/download-artifact@v1
+      with:
+        name: bench-base
+    - name: Delete artifact
+      uses: geekyeggo/delete-artifact@v1
+      with:
+        name: bench-base
+        failOnError: false
+    - uses: IronCoreLabs/rust-toolchain@v1
+      with:
+        toolchain: stable
+    - uses: actions-rs/cargo@v1
+      with:
+        command: install
+        args: critcmp
+    - name: Compare benchmarks
+      run: |
+        if ! critcmp bench-base/results.json bench-current/results.json -t 10 ; then
+          echo "# Benchmark blew big budget! Bad!" > comment.md
+        fi
+        echo "Benchmark results comparing with base:" >> comment.md
+        echo '```' >> comment.md
+        critcmp bench-base/results.json bench-current/results.json -t 2 >> comment.md || true
+        echo '```' >> comment.md
+        cat comment.md
+        mv comment.md .github/workflows/comment.md
+    # This will post a comment to the PR with benchmark results, but it's disabled because it's annoying.
+    # - uses: harupy/comment-on-pr@c0522c4
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #   with:
+    #     filename: comment.md
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ target/
 Cargo.lock
 .idea
 *.iml
-*.code-workspace
+*.code-workspace
+.direnv
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,10 @@
 # Changelog
 
 ## Unreleased
-- [[#175](https://github.com/IronCoreLabs/recrypt-rs/pull/175)] 
+
+- [[#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)]
   - Change MSRV to Rust 1.57.0
 
 ## 0.13.1 (2021-11-29)

diff --git 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.57.0"
+rust-version = "1.60.0"
 
 [target.'cfg(all(unix, not(target_arch = "wasm32")))'.dependencies]
 libc = {version = "0.2"}