Skip to content

Commit

Permalink
Merge branch 'main' into dev/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
NotroDev committed Dec 7, 2024
2 parents 6732ee0 + 656da60 commit e2e59c4
Show file tree
Hide file tree
Showing 6 changed files with 111 additions and 3 deletions.
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
done
- name: 📤 | Upload macOS artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: SkEditorMac
path: "*.zip"
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
tar -czf SkEditor.tar.gz SkEditorFilesL/
- name: 📤 | Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Linux (multiarch)
path: SkEditor.tar.gz
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/update-nix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: update-flake-lock
on:
workflow_dispatch: # allows manual triggering
schedule:
- cron: '0 0 * * 0' # runs weekly on Sunday at 00:00

jobs:
lockfile:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@main
- name: Update flake.lock
uses: DeterminateSystems/update-flake-lock@main
with:
pr-title: "Update flake.lock"
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -366,4 +366,7 @@ FodyWeavers.xsd
*.bat

# JetBrains Rider
.idea/
.idea/

# nix
.direnv
58 changes: 58 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
};

outputs =
inputs@{ nixpkgs, flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } {
systems = nixpkgs.lib.systems.flakeExposed;
perSystem =
{
lib,
pkgs,
system,
config,
...
}:
{
formatter = pkgs.nixfmt-rfc-style;
devShells.default = pkgs.mkShell {
packages = with pkgs; [
dotnet-sdk_8
];
};
};
};
}

0 comments on commit e2e59c4

Please sign in to comment.