From ed31137f94dc0e45b3abe1b1cd94aa1c927a6264 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 20:31:57 -0400 Subject: [PATCH 1/3] feat: upgrade sigil to 0.9.0 --- bin/compile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/compile b/bin/compile index f7f1869..b7df354 100755 --- a/bin/compile +++ b/bin/compile @@ -7,8 +7,8 @@ NGINX_VERSION="1.17.0" NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz" PCRE_VERSION="8.45" PCRE_TARBALL="pcre-${PCRE_VERSION}.tar.gz" -SIGIL_VERSION="0.4.0" -SIGIL_TARBALL="sigil_${SIGIL_VERSION}_Linux_x86_64.tgz" +SIGIL_VERSION="0.9.0" +SIGIL_TARBALL="gliderlabs-sigil_${SIGIL_VERSION}_linux_amd64.tgz" ZLIB_VERSION="1.2.12" ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz" @@ -69,7 +69,7 @@ fi if [[ ! -f "sigil" ]]; then echo "-----> Download and unzip sigil ${SIGIL_VERSION} via http" - curl -sSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/${SIGIL_TARBALL}" -o "${SIGIL_TARBALL}" + curl -sSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/gliderlabs-sigil_${SIGIL_VERSION}_linux_amd64.tgz" -o "${SIGIL_TARBALL}" tar xzf "${SIGIL_TARBALL}" && rm -rf "${SIGIL_TARBALL}" fi From ad5e831e74e17d957de5da71b70fee40d128c84c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 20:36:01 -0400 Subject: [PATCH 2/3] chore: debug --- bin/compile | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/compile b/bin/compile index b7df354..0a5d460 100755 --- a/bin/compile +++ b/bin/compile @@ -71,6 +71,7 @@ if [[ ! -f "sigil" ]]; then echo "-----> Download and unzip sigil ${SIGIL_VERSION} via http" curl -sSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/gliderlabs-sigil_${SIGIL_VERSION}_linux_amd64.tgz" -o "${SIGIL_TARBALL}" tar xzf "${SIGIL_TARBALL}" && rm -rf "${SIGIL_TARBALL}" + ls -lah . fi mkdir -p "$BUILD_DIR/sigil" From 6a99e870e4d368028bebf783af54cfc945c91412 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 20:42:01 -0400 Subject: [PATCH 3/3] fix: copy the new binary into the correct place --- bin/compile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/compile b/bin/compile index 0a5d460..7d89849 100755 --- a/bin/compile +++ b/bin/compile @@ -71,11 +71,10 @@ if [[ ! -f "sigil" ]]; then echo "-----> Download and unzip sigil ${SIGIL_VERSION} via http" curl -sSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/gliderlabs-sigil_${SIGIL_VERSION}_linux_amd64.tgz" -o "${SIGIL_TARBALL}" tar xzf "${SIGIL_TARBALL}" && rm -rf "${SIGIL_TARBALL}" - ls -lah . fi mkdir -p "$BUILD_DIR/sigil" -cp -r sigil "$BUILD_DIR/sigil/" +cp -r gliderlabs-sigil-amd64 "$BUILD_DIR/sigil/sigil" cd "nginx-${NGINX_VERSION}" if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then