Skip to content

Commit 7b54a9c

Browse files
rwaffenbastelfreak
authored andcommitted
fix: update build environment to use ubuntu-22.04 and streamline build commands
1 parent 196d54f commit 7b54a9c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/pr-testing.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
build:
8686
name: build openvox-server - Java ${{ matrix.java }} Ruby ${{ matrix.ruby }}
87-
runs-on: ubuntu-24.04
87+
runs-on: ubuntu-22.04
8888
strategy:
8989
fail-fast: false
9090
matrix:
@@ -116,11 +116,11 @@ jobs:
116116
- name: build it
117117
run: bundle exec rake vox:build
118118
env:
119-
# EZBAKE_ALLOW_UNREPRODUCIBLE_BUILDS: true
119+
EZBAKE_ALLOW_UNREPRODUCIBLE_BUILDS: true
120120
EZBAKE_BRANCH: no-bundle-on-local-build
121-
# EZBAKE_NODEPLOY: true
121+
EZBAKE_NODEPLOY: true
122122
EZBAKE_REPO: https://github.com/rwaffen/ezbake
123-
# LEIN_PROFILES: ezbake
123+
LEIN_PROFILES: ezbake
124124

125125
clojure-linting:
126126
name: Clojure Linting

tasks/build.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace :vox do
4343

4444
puts "Building openvox-server"
4545
run_command("rm -rf ruby && rm -rf output && bundle install --without test && lein install", silent: false, print_command: true)
46-
run_command("COW=\"#{@debs}\" MOCK=\"#{@rpms}\" EZBAKE_ALLOW_UNREPRODUCIBLE_BUILDS=true EZBAKE_NODEPLOY=true LEIN_PROFILES=ezbake lein with-profile user,ezbake,provided ezbake local-build", silent: false, print_command: true)
46+
run_command("COW=\"#{@debs}\" MOCK=\"#{@rpms}\" lein with-profile user,ezbake,provided ezbake local-build", silent: false, print_command: true)
4747
run_command("sudo chown -R $USER output", print_command: true)
4848
Dir.glob('output/**/*i386*').each { |f| FileUtils.rm_rf(f) }
4949
Dir.glob('output/puppetserver-*.tar.gz').each { |f| FileUtils.mv(f, f.sub('puppetserver','openvox-server'))}

0 commit comments

Comments
 (0)