diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-03-15 21:15:35 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-03-15 21:15:35 +0100 |
| commit | 2f19f12b7d8e1616249acf2fcb40d904ed433620 (patch) | |
| tree | 4432669c30887fa48c4587a4c84a30093d1574fc | |
| parent | f1ccb39b2a93b8a1cc0ee83403ee681910d22fbb (diff) | |
| download | vyos-1x-2f19f12b7d8e1616249acf2fcb40d904ed433620.tar.gz vyos-1x-2f19f12b7d8e1616249acf2fcb40d904ed433620.zip | |
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..
| -rw-r--r-- | .github/workflows/package-smoketest.yml | 1 | ||||
| -rw-r--r-- | Makefile | 2 |
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 @@ -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 |