github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 08:17:37 +00:00
Code Issues Projects Releases Wiki Activity

revert: "snap: Fix yq error in build"

Browse Source 
This reverts commit 6cc1920c37.

Instead of updating the syntax of yq, let's use yq 3.x, otherwise
yq must be updated in the CI and the syntax updated in all the
tools (osbuilder, packging).

Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
Julio Montes 2021-01-14 11:13:27 -06:00
parent 74ebd96f99
commit ef1feaf38f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
snap/snapcraft.yaml
View File

@ -68,7 +68,7 @@ parts:
chmod +x ${yq_path} chmod +x ${yq_path}
kata_dir=gopath/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME} kata_dir=gopath/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME}
version="$(${yq_path} e .languages.golang.meta.newest-version ${kata_dir}/versions.yaml)" version="$(${yq_path} r ${kata_dir}/versions.yaml languages.golang.meta.newest-version)"
tarfile="go${version}.${goos}-${goarch}.tar.gz" tarfile="go${version}.${goos}-${goarch}.tar.gz"
curl -LO https://golang.org/dl/${tarfile} curl -LO https://golang.org/dl/${tarfile}
tar -xf ${tarfile} --strip-components=1 tar -xf ${tarfile} --strip-components=1
@ -240,15 +240,15 @@ parts:
# arch-specific definition # arch-specific definition
case "$(uname -m)" in case "$(uname -m)" in
"aarch64") "aarch64")
branch="$(${yq} e .assets.hypervisor.qemu.architecture.aarch64.branch ${versions_file})" branch="$(${yq} r ${versions_file} assets.hypervisor.qemu.architecture.aarch64.branch)"
url="$(${yq} e .assets.hypervisor.qemu.url ${versions_file})" url="$(${yq} r ${versions_file} assets.hypervisor.qemu.url)"
commit="$(${yq} e .assets.hypervisor.qemu.architecture.aarch64.commit ${versions_file})" commit="$(${yq} r ${versions_file} assets.hypervisor.qemu.architecture.aarch64.commit)"
patches_dir="${kata_dir}/tools/packaging/obs-packaging/qemu-aarch64/patches/" patches_dir="${kata_dir}/tools/packaging/obs-packaging/qemu-aarch64/patches/"
;; ;;
*) *)
branch="$(${yq} e .assets.hypervisor.qemu.tag ${versions_file})" branch="$(${yq} r ${versions_file} assets.hypervisor.qemu.tag)"
url="$(${yq} e .assets.hypervisor.qemu.url ${versions_file})" url="$(${yq} r ${versions_file} assets.hypervisor.qemu.url)"
commit="" commit=""
patches_dir="${kata_dir}/tools/packaging/qemu/patches/$(echo ${branch} | sed -e 's/.[[:digit:]]*$//' -e 's/^v//').x" patches_dir="${kata_dir}/tools/packaging/qemu/patches/$(echo ${branch} | sed -e 's/.[[:digit:]]*$//' -e 's/^v//').x"
;; ;;