diff --git a/dsl/flatpak_jobs.groovy b/dsl/flatpak_jobs.groovy --- a/dsl/flatpak_jobs.groovy +++ b/dsl/flatpak_jobs.groovy @@ -8,7 +8,7 @@ def jobName = "${it.name}_flatpak" // Read in the necessary Pipeline template - def pipelineTemplate = readFileFromWorkspace("flatpak/generic-build.pipeline") + def pipelineTemplate = readFileFromWorkspace("${it.script}") // Now we can construct our Pipeline script // We append a series of variables to the top of it to provide a variety of useful information to the otherwise templated script // These appended variables are what makes one build different to the next, aside from the template which was used diff --git a/flatpak/gather-jobs.py b/flatpak/gather-jobs.py --- a/flatpak/gather-jobs.py +++ b/flatpak/gather-jobs.py @@ -65,15 +65,22 @@ jobDescription = "{0} nightly build for Flatpak".format( manifest['id'] ) # Add it to the list of jobs to be built - jobEntry = { + jobsGathered.append( { 'name': jobName, 'description': jobDescription, 'manifest': manifestPath, 'repositoryUrl': repositoryUrl, - 'branch': manifest['branch'] - } - - jobsGathered.append( jobEntry ) + 'branch': manifest['branch'], + 'script': 'generic-build.pipeline' + }) + jobsGathered.append( { + 'name': jobName + "_arm", + 'description': jobDescription, + 'manifest': manifestPath, + 'repositoryUrl': repositoryUrl, + 'branch': manifest['branch'], + 'script': 'build-arm.pipeline' + }) # Otherwise maybe it could be a remote Flatpak manifest? if entry.name.endswith('remoteapp'):