Skip to content

Commit

Permalink
Merge pull request #1792 from dbungert/snap-builds
Browse files Browse the repository at this point in the history
Fix snap build, and CI enforce it
  • Loading branch information
dbungert authored Sep 11, 2023
2 parents f7c5d8c + 7ef514f commit 705c752
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/snap.yaml
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 2 deletions subiquitycore/models/network.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
from typing import Dict, List, Optional

import attr
import probert.network
import yaml

from subiquitycore import netplan
Expand Down Expand Up @@ -196,10 +195,15 @@ def __init__(self, model, name, typ):
self._name = name
self.type = typ
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
# 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().
self.info: Optional[probert.network.Link] = None
self.info: Optional[Link] = None
self.disabled_reason = None
self.dhcp_events = {}
self._dhcp_state = {
Expand Down

0 comments on commit 705c752

Please sign in to comment.