Skip to content

Commit eb9a848

Browse files
Merge pull request #386 from SuperSandro2000/ci
2 parents 61fb452 + ade67f8 commit eb9a848

File tree

9 files changed

+23
-32
lines changed

9 files changed

+23
-32
lines changed

.github/workflows/deadnix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
on: [push]
2-
31
name: Dead code analysis
42

3+
on: [merge_group, push, pull_request]
4+
55
jobs:
66
deadnix:
77
name: Deadnix

.github/workflows/doc.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
name: doc
1+
name: Documentation
22

3-
on:
4-
push:
5-
branches:
6-
- main
3+
on: [merge_group, push, pull_request]
74

85
jobs:
96
deploy:
@@ -22,6 +19,7 @@ jobs:
2219
- name: Build
2320
run: nix build .#doc
2421
- name: Deploy
22+
if: github.ref == 'refs/heads/main'
2523
uses: peaceiris/actions-gh-pages@v4
2624
with:
2725
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/prebuilt-24.11.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/prebuilt-25.05.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
workflow_dispatch: # allows manual triggering
55
schedule:
66
- cron: '0 0 * * *' # runs daily at 00:00
7+
merge_group:
8+
pull_request:
79
push:
8-
branches:
9-
- main
1010

1111
jobs:
1212
build:
@@ -15,7 +15,12 @@ jobs:
1515
- uses: actions/checkout@v4
1616
- uses: cachix/install-nix-action@v31
1717
- uses: cachix/cachix-action@v16
18+
if: github.ref == 'refs/heads/main'
1819
with:
1920
name: microvm
2021
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
22+
- uses: cachix/cachix-action@v16
23+
if: github.ref != 'refs/heads/main'
24+
with:
25+
name: microvm
2126
- run: nix build -L .#prebuilt --override-input nixpkgs github:nixos/nixpkgs/release-25.05

.github/workflows/prebuilt-unstable.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
workflow_dispatch: # allows manual triggering
55
schedule:
66
- cron: '0 0 * * *' # runs daily at 00:00
7+
merge_group:
8+
pull_request:
79
push:
8-
branches:
9-
- main
1010

1111
jobs:
1212
build:
@@ -15,7 +15,12 @@ jobs:
1515
- uses: actions/checkout@v4
1616
- uses: cachix/install-nix-action@v31
1717
- uses: cachix/cachix-action@v16
18+
if: github.ref == 'refs/heads/main'
1819
with:
1920
name: microvm
2021
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
22+
- uses: cachix/cachix-action@v16
23+
if: github.ref != 'refs/heads/main'
24+
with:
25+
name: microvm
2126
- run: nix build -L .#prebuilt --override-input nixpkgs github:nixos/nixpkgs/nixos-unstable

lib/runners/cloud-hypervisor.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{ pkgs
22
, microvmConfig
33
, macvtapFds
4+
, ...
45
}:
56

67
let

lib/runners/crosvm.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{ pkgs
22
, microvmConfig
33
, macvtapFds
4+
, ...
45
}:
56

67
let

lib/runners/qemu.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
, microvmConfig
33
, macvtapFds
44
, withDriveLetters
5+
, ...
56
}:
67

78
let

lib/runners/stratovirt.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
, microvmConfig
33
, macvtapFds
44
, withDriveLetters
5+
, ...
56
}:
67

78
let

0 commit comments

Comments
 (0)