NaxdyOrg/NaxGCC-FW
2
0
Fork 2
Code Issues Pull requests1 Releases4 Activity Actions

chore: improve flake & ci #28

Merged
Naxdy merged 1 commit from work/improve-flake into main 2024-10-27 20:49:20 +00:00
Conversation 0 Commits 1 Files changed 3 +28 -26
3 changed files with 28 additions and 26 deletions
Showing only changes of commit 9455772a45 - Show all commits

4
.forgejo/workflows/clippy-check.yml
View file

@ -10,8 +10,6 @@ jobs:
check: check:
runs-on: nix-flakes runs-on: nix-flakes
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -25,4 +23,4 @@ jobs:
- name: Run Clippy - name: Run Clippy
run: | run: |
nix build .#clippy --print-build-logs -j auto nix flake check . --print-build-logs -j auto

6
.forgejo/workflows/nightly-release.yml
View file

@ -21,9 +21,9 @@ jobs:
cache: "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" cache: "${{ vars.PUBLIC_BINARY_CACHE_NAME }}"
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Run Clippy - name: Run flake checks
run: | run: |
nix build .#clippy --print-build-logs -j auto nix flake check . --print-build-logs -j auto
- name: Build firmware image - name: Build firmware image
run: | run: |
@ -38,7 +38,7 @@ jobs:
git tag nightly -m "Nightly Release" git tag nightly -m "Nightly Release"
git checkout nightly git checkout nightly
git push --set-upstream origin nightly --force git push --set-upstream origin nightly --force
- name: Publish nightly release - name: Publish nightly release
uses: https://gitea.com/actions/gitea-release-action@v1.3.0 uses: https://gitea.com/actions/gitea-release-action@v1.3.0
with: with:

44
flake.nix
View file

@ -47,33 +47,37 @@
CARGO_BUILD_TARGET = "thumbv6m-none-eabi"; CARGO_BUILD_TARGET = "thumbv6m-none-eabi";
in in
{ {
packages.default = self.packages.${system}.naxgcc-fw-uf2; packages = {
default = self.packages.${system}.naxgcc-fw-uf2;
packages.naxgcc-fw-uf2 = pkgs.runCommandLocal "${self.packages.${system}.naxgcc-fw.pname}-uf2-${self.packages.${system}.naxgcc-fw.version}" { } '' naxgcc-fw-uf2 = pkgs.runCommandLocal "${self.packages.${system}.naxgcc-fw.pname}-uf2-${self.packages.${system}.naxgcc-fw.version}" { } ''
mkdir -p $out/bin mkdir -p $out/bin
${pkgs.elf2uf2-rs}/bin/elf2uf2-rs ${self.packages.${system}.naxgcc-fw}/bin/${self.packages.${system}.naxgcc-fw.pname} $out/bin/${self.packages.${system}.naxgcc-fw.pname}.uf2 ${pkgs.elf2uf2-rs}/bin/elf2uf2-rs ${self.packages.${system}.naxgcc-fw}/bin/${self.packages.${system}.naxgcc-fw.pname} $out/bin/${self.packages.${system}.naxgcc-fw.pname}.uf2
''; '';
packages.naxgcc-fw = pkgs.callPackage naxgcc-fw = pkgs.callPackage
({ mode ? "build" }: naersk_lib.buildPackage { ({ mode ? "build" }: naersk_lib.buildPackage {
pname = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.name; pname = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.name;
version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version; version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version;
inherit mode; inherit mode;
src = self; src = self;
cargoBuildOptions = _orig: _orig ++ [ cargoBuildOptions = _orig: _orig ++ [
"--target=${CARGO_BUILD_TARGET}" "--target=${CARGO_BUILD_TARGET}"
]; ];
# if a tree falls in the forest and no one is around to hear it, does it make a sound? # if a tree falls in the forest and no one is around to hear it, does it make a sound?
DEFMT_LOG = "off"; DEFMT_LOG = "off";
}) })
{ }; { };
};
packages.clippy = self.packages.${system}.naxgcc-fw.override { checks = {
mode = "clippy"; clippy = self.packages.${system}.naxgcc-fw.override {
mode = "clippy";
};
}; };
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {