Skip to content

Commit 981dc6d

Browse files
committed
Allow override of ezbake version and fix ezbake ref passthrough
Because we want to build 8.11 with an old version of ezbake, and to ease local test/building in the future, this allows the ezbake version to be overridden via the EZBAKE_VERSION env var. This also passes through ezbake-ref to the shared workflow.
1 parent d40f8d4 commit 981dc6d

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ on:
2020
Branch/tag from ezbake that will be used for openvoxdb/server builds.
2121
type: string
2222
default: 'main'
23+
ezbake-ver:
24+
description: 'The version specified in project.clj in the given ezbake-ref. Will default to the version found in project.clj in this repo if not specified.'
25+
type: string
26+
required: false
2327

2428
permissions:
2529
contents: read
@@ -31,4 +35,6 @@ jobs:
3135
ref: ${{ inputs.ref }}
3236
deb_platform_list: ${{ inputs.deb_platform_list }}
3337
rpm_platform_list: ${{ inputs.rpm_platform_list }}
38+
ezbake-ref: ${{ inputs.ezbake-ref }}
39+
ezbake-ver: ${{ inputs.ezbake-ver }}
3440
secrets: inherit

project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
[puppetlabs/puppetserver ~ps-version]
172172
[com.puppetlabs/trapperkeeper-webserver-jetty10]
173173
[puppetlabs/trapperkeeper-metrics]]
174-
:plugins [[puppetlabs/lein-ezbake "3.0.1-SNAPSHOT"]]
174+
:plugins [[puppetlabs/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "3.0.1-SNAPSHOT")]]
175175
:name "puppetserver"}
176176
:uberjar {:dependencies [[org.bouncycastle/bcpkix-jdk18on]
177177
[com.puppetlabs/trapperkeeper-webserver-jetty10]]

tasks/build.rake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ namespace :vox do
7676
run("cd /ezbake && lein install")
7777

7878
puts "Building openvox-server"
79+
ezbake_version_var = ENV['EZBAKE_VERSION'] ? "EZBAKE_VERSION=#{ENV['EZBAKE_VERSION']}" : ''
7980
run("cd /code && rm -rf ruby && rm -rf output && bundle install --without test && lein install")
80-
run("cd /code && COW=\"#{@debs}\" MOCK=\"#{@rpms}\" GEM_SOURCE='https://rubygems.org' EZBAKE_ALLOW_UNREPRODUCIBLE_BUILDS=true EZBAKE_NODEPLOY=true LEIN_PROFILES=ezbake lein with-profile user,ezbake,provided,internal ezbake local-build")
81+
run("cd /code && COW=\"#{@debs}\" MOCK=\"#{@rpms}\" GEM_SOURCE='https://rubygems.org' #{ezbake_version_var} EZBAKE_ALLOW_UNREPRODUCIBLE_BUILDS=true EZBAKE_NODEPLOY=true LEIN_PROFILES=ezbake lein with-profile user,ezbake,provided,internal ezbake local-build")
8182
run_command("sudo chown -R $USER output", print_command: true)
8283
Dir.glob('output/**/*i386*').each { |f| FileUtils.rm_rf(f) }
8384
Dir.glob('output/puppetserver-*.tar.gz').each { |f| FileUtils.mv(f, f.sub('puppetserver','openvox-server'))}

0 commit comments

Comments
 (0)