Skip to content

Commit 2f19f12

Browse files
committed
T5400: initialize OPAM environment where it's really needed
Instead of trying to fix - what we call - "Schroedingers build environment" in the outside world calling this package build, we should rather fix the Makefile/build system..
1 parent f1ccb39 commit 2f19f12

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

.github/workflows/package-smoketest.yml

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
repository: ${{ github.event.pull_request.head.repo.full_name }}
4545
- name: Build vyos-1x package
4646
run: |
47-
eval $(opam env --root=/opt/opam --set-root)
4847
cd packages/vyos-1x; dpkg-buildpackage -uc -us -tc -b
4948
- name: Generate ISO version string
5049
id: version

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ libvyosconfig:
2828
git clone https://github.com/vyos/libvyosconfig.git /tmp/libvyosconfig || exit 1
2929
cd /tmp/libvyosconfig && \
3030
git checkout 677d1e2bf8109b9fd4da60e20376f992b747e384 || exit 1
31-
./build.sh
31+
eval $$(opam env --root=/opt/opam --set-root) && ./build.sh
3232
fi
3333

3434
.PHONY: interface_definitions

0 commit comments

Comments
 (0)