Skip to content

Commit

Permalink
Merge branch 'cirros-dev:main' into 2022/updates-for-0.6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
hrw committed Aug 4, 2022
2 parents 5c1defc + 276f7ab commit 79bcedb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-cirros.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: CirrOS image builder
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
cirros-build-matrix:
Expand Down
1 change: 1 addition & 0 deletions src/etc/modules
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# modules here are loaded one per line
e1000
e1000e
ne2k-pci # arch=x86
8139cp # arch=x86
pcnet32 # arch=x86
Expand Down

0 comments on commit 79bcedb

Please sign in to comment.