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

5
ci/Jenkinsfile vendored
View File

@ -63,14 +63,9 @@ pipeline {
stage('Publish Container') { stage('Publish Container') {
steps { steps {
container('podman') { 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() { push() {
tag=$(tag_name "$1") tag=$(tag_name "$1")
podman push \ podman push hudctrl:$(tag_name ${BUILD_TAG}) registry.pyrocufflink.blue/hudctrl:${tag}
--creds="${PODMAN_AUTH}" \
hudctrl:$(tag_name ${BUILD_TAG}) \
git.pyrocufflink.blue/containerimages/hudctrl:${tag}
} }
push ${BUILD_TAG} push ${BUILD_TAG}

View File

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