StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1792 from dbungert/snap-builds 

Fix snap build, and CI enforce it
This commit is contained in:
Dan Bungert 2023-09-11 10:12:19 -06:00 committed by GitHub
parent f7c5d8c665 7ef514f79a
commit 705c752320
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/snap.yaml vendored Normal file
View File

@ -0,0 +1,10 @@
name: CI
on: [push, pull_request]
jobs:
snap-build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: snapcore/action-build@v1

8
subiquitycore/models/network.py
View File

@ -21,7 +21,6 @@ from socket import AF_INET, AF_INET6
from typing import Dict, List, Optional from typing import Dict, List, Optional
import attr import attr
import probert.network
import yaml import yaml
from subiquitycore import netplan from subiquitycore import netplan
@ -196,10 +195,15 @@ class NetworkDev:
self._name = name self._name = name
self.type = typ self.type = typ
self.config = {} self.config = {}
# import done here to break a chain where anybody importing
# subiquity.common.types has to have probert
from probert.network import Link
# Devices that have been configured in Subiquity but do not (yet) exist # Devices that have been configured in Subiquity but do not (yet) exist
# on the system have their "info" field set to None. Once they exist, # on the system have their "info" field set to None. Once they exist,
# probert should pass on the information through a call to new_link(). # probert should pass on the information through a call to new_link().
self.info: Optional[probert.network.Link] = None self.info: Optional[Link] = None
self.disabled_reason = None self.disabled_reason = None
self.dhcp_events = {} self.dhcp_events = {}
self._dhcp_state = { self._dhcp_state = {