Fix Nix build, add Nix to CI (#840)
* Nix: Reuse input `flake-utils` in `zig-overlay` * CI/main: convert line endings from `CRLF` to `LF` * CI: Add Nix build
This commit is contained in:
parent
2717b0fba1
commit
20ba87c173
17
.github/workflows/main.yml
vendored
17
.github/workflows/main.yml
vendored
@ -4,9 +4,11 @@ on:
|
|||||||
push:
|
push:
|
||||||
paths:
|
paths:
|
||||||
- "**.zig"
|
- "**.zig"
|
||||||
|
- "flake.*"
|
||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- "**.zig"
|
- "**.zig"
|
||||||
|
- "flake.*"
|
||||||
schedule:
|
schedule:
|
||||||
- cron: "0 0 * * *"
|
- cron: "0 0 * * *"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
@ -118,3 +120,18 @@ jobs:
|
|||||||
REMOTE_HOST: ${{ secrets.WEBSITE_DEPLOY_HOST }}
|
REMOTE_HOST: ${{ secrets.WEBSITE_DEPLOY_HOST }}
|
||||||
REMOTE_USER: ${{ secrets.WEBSITE_DEPLOY_USER }}
|
REMOTE_USER: ${{ secrets.WEBSITE_DEPLOY_USER }}
|
||||||
TARGET: ${{ secrets.WEBSITE_DEPLOY_FOLDER }}
|
TARGET: ${{ secrets.WEBSITE_DEPLOY_FOLDER }}
|
||||||
|
|
||||||
|
- name: Install Nix
|
||||||
|
if: ${{ matrix.os == 'ubuntu-latest' }}
|
||||||
|
uses: cachix/install-nix-action@v18
|
||||||
|
|
||||||
|
- name: Install Cachix
|
||||||
|
if: ${{ matrix.os == 'ubuntu-latest' }}
|
||||||
|
uses: cachix/cachix-action@v12
|
||||||
|
with:
|
||||||
|
name: zigtools
|
||||||
|
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
||||||
|
|
||||||
|
- name: Build Nix flake package
|
||||||
|
if: ${{ matrix.os == 'ubuntu-latest' }}
|
||||||
|
run: nix build --print-build-logs
|
||||||
|
19
flake.lock
19
flake.lock
@ -1,21 +1,6 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1667395993,
|
|
||||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_2": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659877975,
|
"lastModified": 1659877975,
|
||||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||||
@ -110,7 +95,9 @@
|
|||||||
},
|
},
|
||||||
"zig-overlay": {
|
"zig-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": [
|
||||||
|
"flake-utils"
|
||||||
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
zig-overlay.url = "github:mitchellh/zig-overlay";
|
zig-overlay.url = "github:mitchellh/zig-overlay";
|
||||||
zig-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
zig-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
zig-overlay.inputs.flake-utils.follows = "flake-utils";
|
||||||
|
|
||||||
gitignore.url = "github:hercules-ci/gitignore.nix";
|
gitignore.url = "github:hercules-ci/gitignore.nix";
|
||||||
gitignore.inputs.nixpkgs.follows = "nixpkgs";
|
gitignore.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
Loading…
Reference in New Issue
Block a user