Update CI; Clean up flake.nix

This commit is contained in:
Agatha Lovelace 2024-01-08 21:35:03 +01:00
parent 66228bbefe
commit 42b4582092
Signed by: sorceress
GPG Key ID: 01D0B3AB10CED4F8
2 changed files with 21 additions and 11 deletions

View File

@ -1,19 +1,29 @@
name: "Build legacy Nix package on Ubuntu" on: push
name: "Build Nix package on Ubuntu"
on: env:
push: RUSTFLAGS: "-Dwarnings"
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: cachix/install-nix-action@v12 - uses: cachix/install-nix-action@v23
- name: Building package - name: Building package
run: nix-build . -A defaultPackage.x86_64-linux run: nix build
- name: Get repository name
run: echo "REPO_NAME=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV
- name: Get commit hash - name: Get commit hash
run: echo "COMMIT_HASH=${GITHUB_SHA::6}" >> $GITHUB_ENV run: echo "COMMIT_HASH=${GITHUB_SHA::6}" >> $GITHUB_ENV
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: url-eater-${{ env.COMMIT_HASH }}-x86_64-linux name: ${{ env.REPO_NAME }}-${{ env.COMMIT_HASH }}-x86_64-linux
path: result/bin/url-eater path: result/bin/${{ env.REPO_NAME }}
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v23
- name: Lint
run: nix develop --command cargo clippy --all-targets --all-features

View File

@ -11,8 +11,8 @@
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
naersk-lib = pkgs.callPackage naersk { }; naersk-lib = pkgs.callPackage naersk { };
in { in {
defaultPackage = naersk-lib.buildPackage ./.; packages.default = naersk-lib.buildPackage ./.;
devShell = with pkgs; devShells.default = with pkgs;
mkShell { mkShell {
buildInputs = [ buildInputs = [
cargo cargo
@ -25,7 +25,7 @@
RUST_SRC_PATH = rustPlatform.rustLibSrc; RUST_SRC_PATH = rustPlatform.rustLibSrc;
}; };
}) // { }) // {
nixosModule = { config, lib, pkgs, ... }: nixosModules.default = { config, lib, pkgs, ... }:
with lib; with lib;
let cfg = config.services.url-eater; let cfg = config.services.url-eater;
in { in {