summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/package-smoketest.yml1
-rw-r--r--Makefile2
2 files changed, 1 insertions, 2 deletions
diff --git a/.github/workflows/package-smoketest.yml b/.github/workflows/package-smoketest.yml
index 6ab04ac9d..2c90fed39 100644
--- a/.github/workflows/package-smoketest.yml
+++ b/.github/workflows/package-smoketest.yml
@@ -44,7 +44,6 @@ jobs:
repository: ${{ github.event.pull_request.head.repo.full_name }}
- name: Build vyos-1x package
run: |
- eval $(opam env --root=/opt/opam --set-root)
cd packages/vyos-1x; dpkg-buildpackage -uc -us -tc -b
- name: Generate ISO version string
id: version
diff --git a/Makefile b/Makefile
index 3f3ba5ba7..3ec5ed73f 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ libvyosconfig:
git clone https://github.com/vyos/libvyosconfig.git /tmp/libvyosconfig || exit 1
cd /tmp/libvyosconfig && \
git checkout 677d1e2bf8109b9fd4da60e20376f992b747e384 || exit 1
- ./build.sh
+ eval $$(opam env --root=/opt/opam --set-root) && ./build.sh
fi
.PHONY: interface_definitions