Merge pull request #90 from dokku/fix-sigil-download

fix: properly download sigil

.github/workflows/deploy.yml

@@ -1,5 +1,5 @@
 ---
-name: 'review-app'
+name: 'deploy'
 
 # yamllint disable-line rule:truthy
 on:
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cloning repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/review-app.yml

@@ -1,5 +1,5 @@
 ---
-name: 'review-app'
+name: "review-app"
 
 # yamllint disable-line rule:truthy
 on:
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cloning repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -20,9 +20,9 @@ jobs:
         with:
           # create a review app
           command: review-apps:create
-          git_remote_url: 'ssh://dokku@dokku.com/nginx-buildpack'
+          git_remote_url: "ssh://dokku@dokku.com/nginx-buildpack"
           # specify `--force` as a flag for git pushes
-          git_push_flags: '--force'
+          git_push_flags: "--force"
           # specify a name for the review app
           review_app_name: nginx-buildpack-${{ github.event.pull_request.number }}
           ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}

bin/compile

@@ -3,13 +3,16 @@
 set -eo pipefail
 [[ $TRACE ]] && set -x
 
-NGINX_VERSION="1.26.2"
+# https://nginx.org/en/download.html
+NGINX_VERSION="1.29.3"
 NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
-PCRE_VERSION="10.42"
+# https://github.com/PCRE2Project/pcre2/releases
+PCRE_VERSION="10.47"
 PCRE_TARBALL="pcre2-${PCRE_VERSION}.tar.gz"
-SIGIL_VERSION="0.10.1"
+# https://github.com/gliderlabs/sigil/releases
-SIGIL_TARBALL="gliderlabs-sigil_${SIGIL_VERSION}_linux_amd64.tgz"
+SIGIL_VERSION="0.11.5"
-ZLIB_VERSION="1.3"
+# https://github.com/madler/zlib/releases
+ZLIB_VERSION="1.3.1"
 ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"
 
 suppress() {
@@ -67,18 +70,18 @@ if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then
   tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
 fi
 
-if [[ ! -f "gliderlabs-sigil-amd64" ]]; then
+mkdir -p "$BUILD_DIR/sigil"
+if [[ ! -f "$BUILD_DIR/sigil/sigil-${SIGIL_VERSION}" ]]; 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}"
+  curl -fsSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/sigil-linux-amd64" -o "$BUILD_DIR/sigil/sigil-${SIGIL_VERSION}"
-  tar xzf "${SIGIL_TARBALL}" && rm -rf "${SIGIL_TARBALL}"
+  cp "$BUILD_DIR/sigil/sigil-${SIGIL_VERSION}" "$BUILD_DIR/sigil/sigil"
+  chmod +x "$BUILD_DIR/sigil/sigil"
 fi
 
-mkdir -p "$BUILD_DIR/sigil"
+if [[ ! -f "$BUILD_DIR/sigil/sigil" ]]; then
-if [[ ! -f "gliderlabs-sigil-amd64" ]]; then
+  echo " !     Missing sigil binary"
-  echo " !     Missing gliderlabs-sigil-amd64 binary"
   exit 1
 fi
-cp -r gliderlabs-sigil-amd64 "$BUILD_DIR/sigil/sigil"
 
 cd "nginx-${NGINX_VERSION}"
 if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then