Merge ~kzapalowicz/snappy-hwe-snaps/+git/udisks2:fix/build-issue into ~snappy-hwe-team/snappy-hwe-snaps/+git/udisks2:ciborium/0.2.12

[Konrad Zapałowicz]

fix build issue in -ui related to recent udisks2 changes

The NewStorageWatcher has now only one argument and is allowing all
file system ssupported by the kernel to be mounted.

This commit changes the ciborium-ui accordingly

fix build issue in -ui related to recent udisks2 changes

The NewStorageWatcher has now only one argument and is allowing all
file system ssupported by the kernel to be mounted.

This commit changes the ciborium-ui accordingly

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:ddb275d0942afe3b75207db2f3573fd550a2c1b7
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1001/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/688
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/909/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1001/rebuild

review: Approve (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:4f3735e0729a39657998eb179a7401443022f301
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1002/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/689/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/910/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1002/rebuild

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:ea36defdb78cf6f07f8422993717453c17b167df
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1003/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/690
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/911/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1003/rebuild

review: Approve (continuous-integration)

diff --git a/cmd/ciborium-ui/main.go b/cmd/ciborium-ui/main.go
index 426d5a8..3b5e2b4 100644
--- a/cmd/ciborium-ui/main.go
+++ b/cmd/ciborium-ui/main.go
@@ -50,7 +50,6 @@ type DriveList struct {
 }
 
 var mainQmlPath = filepath.Join("ciborium", "qml", "main.qml")
-var supportedFS []string = []string{"vfat"}
 
 func init() {
 	os.Setenv("APP_ID", "ciborium")
@@ -110,7 +109,7 @@ func newDriveControl() (*driveControl, error) {
 	if err != nil {
 		return nil, err
 	}
-	udisks := udisks2.NewStorageWatcher(systemBus, supportedFS...)
+	udisks := udisks2.NewStorageWatcher(systemBus)
 
 	return &driveControl{udisks: udisks}, nil
 }
diff --git a/run-tests.sh b/run-tests.sh
index 9645219..968554e 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -9,6 +9,7 @@ fi
 $SUDO apt update
 $SUDO apt install -y --force-yes \
 	golang-go \
+	libqt5opengl5-dev pkg-config qtbase5-private-dev qtdeclarative5-private-dev \
 	bzr
 
 export GOPATH=`mktemp -d`
@@ -17,9 +18,13 @@ mkdir -p $GOPATH/src/launchpad.net
 ln -sf $PWD $GOPATH/src/launchpad.net/ciborium
 
 go get -v launchpad.net/ciborium/cmd/ciborium
+go get -v launchpad.net/ciborium/cmd/ciborium-ui
 go get -v -t launchpad.net/ciborium/cmd/ciborium
+go get -v -t launchpad.net/ciborium/cmd/ciborium-ui
 
 go build -v launchpad.net/ciborium/cmd/ciborium
+go build -v launchpad.net/ciborium/cmd/ciborium-ui
 
 go test -v launchpad.net/ciborium/cmd/ciborium
+go test -v launchpad.net/ciborium/cmd/ciborium-ui
 go test -v launchpad.net/ciborium/udisks2