Skip to content

Remove use of deprecated bundler flags #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nmburgan merged 2 commits into from
May 12, 2026
Merged

Remove use of deprecated bundler flags #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7339a1a
Remove use of deprecated bundler flags
nmburgan May 12, 2026
fb677fe
Change PR workflow to use new docker image and caching scheme
nmburgan May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2'
ruby-version: '4.0'
bundler-cache: true
working-directory: resources/puppetlabs/lein-ezbake/template/global
- run: bundle env
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
- project: openvoxdb
repository: 'OpenVoxProject/openvoxdb'
steps:
- name: checkout openvox-server
- name: Checkout repository
uses: actions/checkout@v6
with:
repository: ${{ matrix.repository }}
Expand All @@ -97,10 +97,28 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2'
ruby-version: '4.0'
bundler-cache: true
- name: Display Ruby environment
run: bundle env
- id: docker-cache
uses: actions/cache/restore@v4
with:
path: /tmp/ezbake-builder.tar
key: docker-ezbake-${{ matrix.project }}-${{ hashFiles('Dockerfile') }}
- name: Load or build Docker image
run: |
if [[ -f /tmp/ezbake-builder.tar ]]; then
docker load -i /tmp/ezbake-builder.tar
else
docker build -t ezbake-builder .
docker save ezbake-builder -o /tmp/ezbake-builder.tar
fi
- uses: actions/cache/save@v4
if: always() && steps.docker-cache.outputs.cache-hit != 'true'
with:
path: /tmp/ezbake-builder.tar
key: docker-ezbake-${{ matrix.project }}-${{ hashFiles('Dockerfile') }}
- name: get ${{ matrix.project }} version
id: version
run: |
Expand Down
8 changes: 6 additions & 2 deletions src/puppetlabs/ezbake/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,15 +1154,19 @@ Additional uberjar dependencies:
(defmethod action "build"
[_ lein-project build-target]
(action "stage" lein-project build-target)
(exec/exec "bundle" "install" "--path" ".bundle/gems" "--binstubs" ".bundle/bin" :dir staging-dir)
(exec/exec "bundle" "config" "set" "--local" "path" ".bundle/gems" :dir staging-dir)
(exec/exec "bundle" "config" "set" "--local" "bin" ".bundle/bin" :dir staging-dir)
(exec/exec "bundle" "install" :dir staging-dir)
(let [downstream-job nil
rake-call ["bundle" "exec" "rake" "pl:jenkins:trigger_build_local_auth"]]
(exec/lazy-sh rake-call {:dir staging-dir})))

(defmethod action "local-build"
[_ lein-project build-target]
(action "stage" lein-project build-target)
(exec/exec "bundle" "install" "--path" ".bundle/gems" "--binstubs" ".bundle/bin" :dir staging-dir)
(exec/exec "bundle" "config" "set" "--local" "path" ".bundle/gems" :dir staging-dir)
(exec/exec "bundle" "config" "set" "--local" "bin" ".bundle/bin" :dir staging-dir)
(exec/exec "bundle" "install" :dir staging-dir)
(let [downstream-job nil
rake-call ["bundle" "exec" "rake" "pl:local_build"]]
(exec/lazy-sh rake-call {:dir staging-dir})))
Expand Down
Loading