From 8148afd53050eed2127e502830c920d797ad6a84 Mon Sep 17 00:00:00 2001 From: Sebastian Toepfer <61313468+sebastian-toepfer@users.noreply.github.com> Date: Thu, 9 Jun 2022 20:11:01 +0200 Subject: [PATCH 1/2] bump alpines packages --- fetch_binaries.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fetch_binaries.sh b/fetch_binaries.sh index 85c03bc0..501319f1 100755 --- a/fetch_binaries.sh +++ b/fetch_binaries.sh @@ -2,19 +2,19 @@ ALPINE_VERSION=v3.15 ALPINE_MIRROR=http://dl-cdn.alpinelinux.org/alpine/ APK_TOOLS=apk-tools-static-2.12.7-r3.apk -BUSYBOX=busybox-static-1.34.1-r3.apk +BUSYBOX=busybox-static-1.34.1-r5.apk ALPINE_KEYS=alpine-keys-2.4-r1.apk ARCH=${1:-x86_64} SHA1SUMS_x86_64="\ 2fa49548020eb850e0a15df03471a07eba55fbc8 $APK_TOOLS -83a302a36b2239669130d459b14619d066d37f22 $BUSYBOX +15e73d6e7ae87f71b86bbf4185da0108375de29c $BUSYBOX 7dba809ae84d5832473f9cbf3bc6522d341299ca $ALPINE_KEYS" SHA1SUMS_armhf="\ 49fd9c34731593f5753fbc100dbb344e3f22cf47 $APK_TOOLS -06bd6d50070251de09f34dd37ebbeb17aa014db8 $BUSYBOX +9c5aa6fcfa691d720cf19a31fc855e6e0dab1689 $BUSYBOX 1c45ddb6ae0a0aee7793505cce4fcee0d82c7ac1 $ALPINE_KEYS" FETCH_DIR="alpine/"$ARCH From ebf60eba8861eb7b935280f7e2f3407ebaee0990 Mon Sep 17 00:00:00 2001 From: Sebastian Toepfer <61313468+sebastian-toepfer@users.noreply.github.com> Date: Thu, 23 Jun 2022 19:31:53 +0200 Subject: [PATCH 2/2] use regex in yarn tests to test readlink result --- tests/yarn.bats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/yarn.bats b/tests/yarn.bats index 406e959d..378b0d27 100644 --- a/tests/yarn.bats +++ b/tests/yarn.bats @@ -17,7 +17,7 @@ END [[ ${lines[${#lines[@]}-1]} = /work ]] run vagga _build pkg link=$(readlink .vagga/pkg) - [[ $link = ".roots/pkg.dfb332bf/root" ]] + [[ $link =~ ^\.roots/pkg\..{8}/root ]] run vagga stat /usr/lib/node_modules/classnames [[ $status = 1 ]] @@ -38,7 +38,7 @@ END [[ ${lines[${#lines[@]}-7]} = " File: /usr/lib/node_modules/classnames" ]] link=$(readlink .vagga/pkg) echo "Link: $link" - [[ $link = ".roots/pkg.06364e8c/root" ]] + [[ $link =~ ^\.roots/pkg\..{8}/root ]] run vagga resolve . [[ $status = 0 ]] [[ ${lines[${#lines[@]}-1]} = "/work" ]] @@ -61,5 +61,5 @@ END [[ ${lines[${#lines[@]}-1]} = "1.0.1" ]] link=$(readlink .vagga/version) echo "Link: $link" - [[ $link = ".roots/version.0a8ecf27/root" ]] + [[ $link =~ ^\.roots/version\..{8}/root ]] }