From f09ed7558107a2bb5334c02305646af8e4bcebcb Mon Sep 17 00:00:00 2001 From: DashieTM Date: Tue, 3 Dec 2024 23:31:22 +0100 Subject: [PATCH] Use nix CI --- .direnv/flake-profile | 2 +- .direnv/flake-profile-1-link | 1 + .direnv/flake-profile-11-link | 1 - .github/workflows/rust.yml | 42 +++++++++++++++---------- flake.lock | 58 ++++++++--------------------------- 5 files changed, 39 insertions(+), 65 deletions(-) create mode 120000 .direnv/flake-profile-1-link delete mode 120000 .direnv/flake-profile-11-link diff --git a/.direnv/flake-profile b/.direnv/flake-profile index c7ae88b..0c05709 120000 --- a/.direnv/flake-profile +++ b/.direnv/flake-profile @@ -1 +1 @@ -flake-profile-11-link \ No newline at end of file +flake-profile-1-link \ No newline at end of file diff --git a/.direnv/flake-profile-1-link b/.direnv/flake-profile-1-link new file mode 120000 index 0000000..122cb0c --- /dev/null +++ b/.direnv/flake-profile-1-link @@ -0,0 +1 @@ +/nix/store/bfq0hy0fwh0hpm6rivbrrjyb4x902pha-nix-shell-env \ No newline at end of file diff --git a/.direnv/flake-profile-11-link b/.direnv/flake-profile-11-link deleted file mode 120000 index 52e7a78..0000000 --- a/.direnv/flake-profile-11-link +++ /dev/null @@ -1 +0,0 @@ -/nix/store/51yb1yhqssknlmxvvscvj0cqbvs0z915-nix-shell-env \ No newline at end of file diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 089fbcf..a9a14db 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,25 +1,33 @@ -name: Rust - +# inspired by https://github.com/danth/stylix/blob/master/.github/workflows/docs.yml +name: Rust-build on: push: - branches: [ "main" ] + branches: ["main"] pull_request: - branches: [ "main" ] - -env: - CARGO_TERM_COLOR: always - + branches: ["main"] jobs: build: - runs-on: [self-hosted, ubuntu] + name: Build + permissions: + contents: read + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: nightly-rust - uses: actions-rs/toolchain@v1 + - name: Install Nix + uses: DeterminateSystems/nix-installer-action@main with: - profile: minimal - toolchain: nightly + github-token: ${{ secrets.GITHUB_TOKEN }} + extra-conf: | + extra-experimental-features = nix-command flakes + - name: Set up cache + uses: DeterminateSystems/magic-nix-cache-action@main + - name: action + uses: cachix/install-nix-action@v25 + with: + nix_path: nixpkgs=channel:nixos-unstable + - name: cache + uses: cachix/cachix-action@v14 + with: + name: reset + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Build - run: cargo build --verbose - - name: Run clippy - run: cargo clippy --fix + run: nix -L build github:${{ github.repository }}/${{ github.sha }} --no-write-lock-file diff --git a/flake.lock b/flake.lock index 1b9d765..64a3a5f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -20,31 +20,13 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1716137900, - "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -56,11 +38,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1706487304, - "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "lastModified": 1728538411, + "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "type": "github" }, "original": { @@ -79,15 +61,14 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1716171463, - "narHash": "sha256-lc7wOh5BjYUoxdhcPkeUY8BmuL2qtRaHlW1403RW48E=", + "lastModified": 1729564184, + "narHash": "sha256-dP764PQ6YhjY7C84Txnrb2vf0H2YdQlp5c6a7G18fgw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "04d61d14803854fd8453ec43c5c53a471e5407a8", + "rev": "d687672b4541496408068bc273d94c643005d4c9", "type": "github" }, "original": { @@ -95,21 +76,6 @@ "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",