From b8bd5bc5ffdeb1c44abe3c24b4804fc74e2933a9 Mon Sep 17 00:00:00 2001 From: Craig Colegrove Date: Wed, 11 Jun 2025 11:25:32 -0700 Subject: [PATCH 1/2] windows-2019 migration --- .github/workflows/ci.yaml | 7 ++++--- Cargo.lock | 2 +- Cargo.toml | 4 ++-- flake.lock | 24 ++++++++++++------------ flake.nix | 8 ++------ rust-toolchain.toml | 2 +- 6 files changed, 22 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a7b5d86..7bb7dab 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,7 +2,8 @@ name: CI on: push: - branches: main + branches: + - main pull_request: jobs: @@ -11,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04, macos-14, windows-2019] + os: [ubuntu-24.04, macos-14, windows-2025] steps: - uses: actions/checkout@v4 - uses: actions/cache@v4 @@ -26,7 +27,7 @@ jobs: run: cargo test cargo-fmt: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: IronCoreLabs/rust-toolchain@v1 diff --git a/Cargo.lock b/Cargo.lock index 517c0f1..d2bddda 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" diff --git a/Cargo.toml b/Cargo.toml index fcc9022..f8c9a5f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,8 +2,8 @@ name = "ironoxide-cli" version = "0.1.0" authors = ["IronCore Labs "] -edition = "2021" -rust-version = "1.75.0" +edition = "2024" +rust-version = "1.85.0" [dependencies] ironoxide = { version = "4", default-features = false, features = [ diff --git a/flake.lock b/flake.lock index 1a64795..f30e4fe 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726042813, - "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", + "lastModified": 1749558678, + "narHash": "sha256-DUVAe8E2X2QM0dAnTGlTiqemMqUMMyIeCH7UeNo0g64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", + "rev": "a12f3a99614894502e73eb816e9e076b0ab05730", "type": "github" }, "original": { @@ -34,11 +34,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718428119, - "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -60,11 +60,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1726021481, - "narHash": "sha256-4J4E+Fh+77XIYnq2RVtg+ENWXpu6t74P0jKN/f2RQmI=", + "lastModified": 1749609482, + "narHash": "sha256-R+Y3tXIUAMosrgo/ynhIUPEONZ+cM0ScbgN7KA8OkoE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1c2c120246c51a644c20ba2a36a33d3bd4860d70", + "rev": "a17da8deb943e7c8b4151914abbfe33d5a4e5b0d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 292dae8..32bc941 100644 --- a/flake.nix +++ b/flake.nix @@ -22,9 +22,7 @@ src = ./.; cargoLock.lockFile = ./Cargo.lock; nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = [ rusttoolchain pkgs.libiconv ] - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = [ rusttoolchain pkgs.libiconv ]; }; }; defaultPackage = packages.ironoxide-cli; @@ -32,9 +30,7 @@ # nix develop devShell = pkgs.mkShell { buildInputs = with pkgs; - [ rusttoolchain pkg-config pkgs.libiconv pkgs.prometheus ] - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.SystemConfiguration ]; + [ rusttoolchain pkg-config pkgs.libiconv pkgs.prometheus ]; }; }); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index bdb353e..806505d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] profile = "default" -channel = "1.81.0" +channel = "1.87.0" From 5758c0cccb2103662306616e0cf3e7d8c5e24ad6 Mon Sep 17 00:00:00 2001 From: Craig Colegrove Date: Wed, 11 Jun 2025 11:30:48 -0700 Subject: [PATCH 2/2] release as well --- .github/workflows/release.yaml | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 462b613..4f03f9c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,9 +9,9 @@ jobs: build: strategy: matrix: - os: [ubuntu-22.04, macos-14, windows-2019] + os: [ubuntu-24.04, macos-14, windows-2025] include: - - os: windows-2019 + - os: windows-2025 ext: .exe runs-on: ${{ matrix.os }} steps: @@ -29,12 +29,12 @@ jobs: path: target/release/ironoxide-cli-${{ matrix.os }}${{ matrix.ext }} release: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: build steps: - uses: actions/checkout@v4 - name: Decrypt PGP key - uses: IronCoreLabs/ironhide-actions/decrypt@v2 + uses: IronCoreLabs/ironhide-actions/decrypt@v3 with: keys: ${{ secrets.IRONHIDE_KEYS }} input: .github/signing-key.asc.iron @@ -48,22 +48,22 @@ jobs: tag_name: ${{ github.ref }} release_name: Version ${{ github.ref }} - - name: Download release artifacts from ubuntu-22.04 + - name: Download release artifacts from ubuntu-24.04 uses: actions/download-artifact@v4 with: - name: release-ubuntu-22.04 - path: release/ubuntu-22.04 + name: release-ubuntu-24.04 + path: release/ubuntu-24.04 - name: Delete artifact uses: geekyeggo/delete-artifact@v5 with: - name: release-ubuntu-22.04 + name: release-ubuntu-24.04 failOnError: false - - name: Sign artifact for ubuntu-22.04 + - name: Sign artifact for ubuntu-24.04 run: | - gpg --batch --detach-sign -a release/ubuntu-22.04/ironoxide-cli-ubuntu-22.04 - gpg --batch --verify release/ubuntu-22.04/ironoxide-cli-ubuntu-22.04.asc release/ubuntu-22.04/ironoxide-cli-ubuntu-22.04 - - name: Upload artifact for ubuntu-22.04 - run: gh release upload ${{ github.ref }} release/ubuntu-22.04/ironoxide-cli-ubuntu-22.04 release/ubuntu-22.04/ironoxide-cli-ubuntu-22.04.asc --clobber + gpg --batch --detach-sign -a release/ubuntu-24.04/ironoxide-cli-ubuntu-24.04 + gpg --batch --verify release/ubuntu-24.04/ironoxide-cli-ubuntu-24.04.asc release/ubuntu-24.04/ironoxide-cli-ubuntu-24.04 + - name: Upload artifact for ubuntu-24.04 + run: gh release upload ${{ github.ref }} release/ubuntu-24.04/ironoxide-cli-ubuntu-24.04 release/ubuntu-24.04/ironoxide-cli-ubuntu-24.04.asc --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -86,21 +86,21 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Download release artifacts from windows-2019 + - name: Download release artifacts from windows-2025 uses: actions/download-artifact@v4 with: - name: release-windows-2019 - path: release/windows-2019 + name: release-windows-2025 + path: release/windows-2025 - name: Delete artifact uses: geekyeggo/delete-artifact@v5 with: - name: release-windows-2019 + name: release-windows-2025 failOnError: false - - name: Sign artifact for windows-2019 + - name: Sign artifact for windows-2025 run: | - gpg --batch --detach-sign -a release/windows-2019/ironoxide-cli-windows-2019.exe - gpg --batch --verify release/windows-2019/ironoxide-cli-windows-2019.exe.asc release/windows-2019/ironoxide-cli-windows-2019.exe - - name: Upload artifact for windows-2019 - run: gh release upload ${{ github.ref }} release/windows-2019/ironoxide-cli-windows-2019.exe release/windows-2019/ironoxide-cli-windows-2019.exe.asc --clobber + gpg --batch --detach-sign -a release/windows-2025/ironoxide-cli-windows-2025.exe + gpg --batch --verify release/windows-2025/ironoxide-cli-windows-2025.exe.asc release/windows-2025/ironoxide-cli-windows-2025.exe + - name: Upload artifact for windows-2025 + run: gh release upload ${{ github.ref }} release/windows-2025/ironoxide-cli-windows-2025.exe release/windows-2025/ironoxide-cli-windows-2025.exe.asc --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}