From 8f4d6a906201889fa8a7c8bf6377f1cb297b2505 Mon Sep 17 00:00:00 2001 From: patrick Date: Mon, 8 Sep 2025 23:18:09 +0000 Subject: [PATCH] Modernise CI (#22) Co-authored-by: Smaug123 <3138005+Smaug123@users.noreply.github.com> Reviewed-on: https://gitea.patrickstevens.co.uk/patrick/advent-of-code-2023/pulls/22 --- .config/dotnet-tools.json | 2 +- .editorconfig | 1 - ...-checks-complete.yml => all-checks-complete.yaml} | 0 .woodpecker/{.build.yml => build.yaml} | 0 AdventOfCode2023.FSharp/Test/Util.fs | 4 +--- flake.lock | 12 ++++++------ flake.nix | 5 +---- 7 files changed, 9 insertions(+), 15 deletions(-) rename .woodpecker/{.all-checks-complete.yml => all-checks-complete.yaml} (100%) rename .woodpecker/{.build.yml => build.yaml} (100%) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 506d284..180f867 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "fantomas": { - "version": "6.2.3", + "version": "7.0.3", "commands": [ "fantomas" ] diff --git a/.editorconfig b/.editorconfig index 9ef5fed..e207c42 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,7 +2,6 @@ root=true [*] charset=utf-8 -end_of_line=crlf trim_trailing_whitespace=true insert_final_newline=true indent_style=space diff --git a/.woodpecker/.all-checks-complete.yml b/.woodpecker/all-checks-complete.yaml similarity index 100% rename from .woodpecker/.all-checks-complete.yml rename to .woodpecker/all-checks-complete.yaml diff --git a/.woodpecker/.build.yml b/.woodpecker/build.yaml similarity index 100% rename from .woodpecker/.build.yml rename to .woodpecker/build.yaml diff --git a/AdventOfCode2023.FSharp/Test/Util.fs b/AdventOfCode2023.FSharp/Test/Util.fs index 4a46068..d0298cc 100644 --- a/AdventOfCode2023.FSharp/Test/Util.fs +++ b/AdventOfCode2023.FSharp/Test/Util.fs @@ -3,9 +3,7 @@ namespace AdventOfCode2023.Test open System.IO open System.Reflection -type Dummy = - class - end +type Dummy = class end [] module Assembly = diff --git a/flake.lock b/flake.lock index aa98498..542fa34 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 96acca6..bf8dfaa 100644 --- a/flake.nix +++ b/flake.nix @@ -14,15 +14,12 @@ system: let pkgs = nixpkgs.legacyPackages.${system}; in - # Conditionally include Swift and Apple SDK for Darwin systems + # Conditionally include Swift for Darwin systems let darwinDeps = if system == "x86_64-darwin" || system == "aarch64-darwin" then [ pkgs.swift - pkgs.darwin.apple_sdk.frameworks.Foundation - pkgs.darwin.apple_sdk.frameworks.CryptoKit - pkgs.darwin.apple_sdk.frameworks.GSS ] else []; in {