1
0
Fork 0

Compare commits

..

No commits in common. "master" and "0.2.0" have entirely different histories.

3 changed files with 7 additions and 16 deletions

7
ci/Jenkinsfile vendored
View File

@ -63,12 +63,7 @@ pipeline {
stage('Publish Container') {
steps {
container('podman') {
withCredentials([usernameColonPassword(
credentialsId: 'jenkins-packages',
variable: 'PODMAN_AUTH',
)]) {
sh '. ci/publish-container.sh'
}
sh '. ci/publish-container.sh'
}
}
}

View File

@ -4,10 +4,7 @@
push() {
tag=$(tag_name "$1")
podman push \
--creds="${PODMAN_AUTH}" \
hudctrl:$(tag_name ${BUILD_TAG}) \
git.pyrocufflink.blue/containerimages/hudctrl:${tag}
podman push hudctrl:$(tag_name ${BUILD_TAG}) registry.pyrocufflink.blue/hudctrl:${tag}
}
push ${BUILD_TAG}

View File

@ -91,7 +91,7 @@ class HUDService:
try:
url = self.urls[monitor.name]
except KeyError:
url = None
continue
if window is None:
window = await self.marionette.new_window('window')
self.windows[monitor.name] = window
@ -101,11 +101,10 @@ class HUDService:
y=1,
)
await self.marionette.fullscreen()
if url is not None:
log.info('Screen %s: Opening URL %s', monitor.name, url)
tasks.append(
asyncio.create_task(self.marionette.navigate(url))
)
log.info('Screen %s: Opening URL %s', monitor.name, url)
tasks.append(
asyncio.create_task(self.marionette.navigate(url))
)
window = None
if tasks:
await asyncio.wait(tasks)