From f66e2194e834e28f5d6031d4491fb242c8676638 Mon Sep 17 00:00:00 2001
From: TornaxO7 <tornax@proton.me>
Date: Mon, 11 Nov 2024 12:51:13 +0100
Subject: [PATCH 1/5] update flake
---
flake.lock | 54 ++++++++++--------------------------------------------
1 file changed, 10 insertions(+), 44 deletions(-)
diff --git a/flake.lock b/flake.lock
index b101ea4..eeaa405 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,30 +1,12 @@
{
"nodes": {
- "flake-utils": {
- "inputs": {
- "systems": "systems"
- },
- "locked": {
- "lastModified": 1681202837,
- "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
- "lastModified": 1702312524,
- "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
+ "lastModified": 1731139594,
+ "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
+ "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {
@@ -36,11 +18,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1681358109,
- "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
+ "lastModified": 1728538411,
+ "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
+ "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
"type": "github"
},
"original": {
@@ -54,20 +36,19 @@
"inputs": {
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay",
- "systems": "systems_2"
+ "systems": "systems"
}
},
"rust-overlay": {
"inputs": {
- "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1702692877,
- "narHash": "sha256-apUL3DgWZGzWQNo13o7Cv4BfwpvXyD00rGWlp7wJyhw=",
+ "lastModified": 1731292155,
+ "narHash": "sha256-fYVoUUtSadbOrH0z0epVQDsStBDS/S/fAK//0ECQAAI=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "2a186e207c9ef8e3eef114259044fc2f92043d59",
+ "rev": "7c4cd99ed7604b79e8cb721099ac99c66f656b3a",
"type": "github"
},
"original": {
@@ -90,21 +71,6 @@
"repo": "default",
"type": "github"
}
- },
- "systems_2": {
- "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",
From 628c9f164ee3f14b3301a84fec4549b42e0a7e0f Mon Sep 17 00:00:00 2001
From: TornaxO7 <tornax@proton.me>
Date: Mon, 11 Nov 2024 12:54:44 +0100
Subject: [PATCH 2/5] update github workflow
---
.github/workflows/tests.yaml | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index a596cd4..f90c518 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -4,19 +4,29 @@ on:
pull_request:
push:
branches:
- - master
+ - main
jobs:
tests:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
- name: Install Nix
- uses: cachix/install-nix-action@v15
+ uses: cachix/install-nix-action@v30
with:
- nix_path: nixpkgs=channel:nixos-21.11
- extra_nix_config: |
- experimental-features = nix-command flakes
+ github_access_token: ${{ secrets.GITHUB_TOKEN }}
- name: Run test suite
run: nix develop -c cargo test
+
+ clippy:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v4
+ - name: Install Nix
+ uses: cachix/install-nix-action@v30
+ with:
+ github_access_token: ${{ secrets.GITHUB_TOKEN }}
+ - name: Run test suite
+ run: nix develop -c cargo clippy
From d20606aa2d06fb13078e6ec58ad585b1813f277f Mon Sep 17 00:00:00 2001
From: TornaxO7 <tornax@proton.me>
Date: Mon, 11 Nov 2024 12:55:30 +0100
Subject: [PATCH 3/5] rename ci file
---
.github/workflows/{tests.yaml => ci.yml} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename .github/workflows/{tests.yaml => ci.yml} (100%)
diff --git a/.github/workflows/tests.yaml b/.github/workflows/ci.yml
similarity index 100%
rename from .github/workflows/tests.yaml
rename to .github/workflows/ci.yml
From ca5e31813a25b630518aba9339485f5bab09f150 Mon Sep 17 00:00:00 2001
From: TornaxO7 <tornax@proton.me>
Date: Mon, 11 Nov 2024 12:56:09 +0100
Subject: [PATCH 4/5] github-ci: remove name
---
.github/workflows/ci.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f90c518..9f109e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,3 @@
-name: tests
-
on:
pull_request:
push:
From 6958426f7fb16fb1ba450a7245b2e916647abc46 Mon Sep 17 00:00:00 2001
From: TornaxO7 <tornax@proton.me>
Date: Mon, 11 Nov 2024 12:56:58 +0100
Subject: [PATCH 5/5] github-workflow: give it a name...
---
.github/workflows/ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9f109e0..ebe3954 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,3 +1,5 @@
+name: ci
+
on:
pull_request:
push: