fix: properly download sigil

.github/workflows/deploy.yml

@@ -9,7 +9,7 @@ on:
       - main
 
 jobs:
-  deploy:
+  review_app:
     runs-on: ubuntu-latest
     steps:
       - name: Cloning repo

.github/workflows/release.yml

@@ -1,81 +0,0 @@
----
-name: "release"
-
-# yamllint disable-line rule:truthy
-on:
-  release:
-    types: [created]
-
-jobs:
-  build-assets:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
-
-      - name: Extract version variables
-        id: versions
-        run: |
-          NGINX_VERSION=$(grep '^NGINX_VERSION=' bin/compile | cut -d'"' -f2)
-          PCRE_VERSION=$(grep '^PCRE_VERSION=' bin/compile | cut -d'"' -f2)
-          ZLIB_VERSION=$(grep '^ZLIB_VERSION=' bin/compile | cut -d'"' -f2)
-          echo "NGINX_VERSION=$NGINX_VERSION" >> "$GITHUB_OUTPUT"
-          echo "PCRE_VERSION=$PCRE_VERSION" >> "$GITHUB_OUTPUT"
-          echo "ZLIB_VERSION=$ZLIB_VERSION" >> "$GITHUB_OUTPUT"
-
-      - name: Download source tarballs
-        run: |
-          cd /tmp
-          curl -sSL "https://nginx.org/download/nginx-${{ steps.versions.outputs.NGINX_VERSION }}.tar.gz" | tar xz
-          curl -sSL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${{ steps.versions.outputs.PCRE_VERSION }}/pcre2-${{ steps.versions.outputs.PCRE_VERSION }}.tar.gz" | tar xz
-          curl -sSL "https://github.com/madler/zlib/archive/v${{ steps.versions.outputs.ZLIB_VERSION }}.tar.gz" | tar xz
-
-      - name: Compile nginx
-        run: |
-          cd /tmp/nginx-${{ steps.versions.outputs.NGINX_VERSION }}
-          ./configure \
-            --with-cpu-opt=generic \
-            --prefix=/tmp/nginx-build \
-            --with-pcre=../pcre2-${{ steps.versions.outputs.PCRE_VERSION }} \
-            --sbin-path=. \
-            --pid-path=./nginx.pid \
-            --conf-path=./nginx.conf \
-            --with-ld-opt="-static" \
-            --with-http_stub_status_module \
-            --with-http_gzip_static_module \
-            --with-file-aio \
-            --with-zlib=../zlib-${{ steps.versions.outputs.ZLIB_VERSION }} \
-            --with-pcre \
-            --with-cc-opt="-O2 -static -static-libgcc" \
-            --without-http_ssi_module \
-            --without-http_userid_module \
-            --without-http_access_module \
-            --without-http_autoindex_module \
-            --without-http_geo_module \
-            --without-http_map_module \
-            --without-http_split_clients_module \
-            --without-http_referer_module \
-            --without-http_fastcgi_module \
-            --without-http_uwsgi_module \
-            --without-http_scgi_module \
-            --without-http_memcached_module \
-            --without-http_empty_gif_module \
-            --without-http_browser_module \
-            --without-http_upstream_ip_hash_module \
-            --without-http_upstream_least_conn_module \
-            --without-http_upstream_keepalive_module \
-            --without-mail_pop3_module \
-            --without-mail_imap_module \
-            --without-mail_smtp_module \
-            --with-http_realip_module
-          sed -i "/CFLAGS/s/ \-O //g" objs/Makefile
-          make -j"$(nproc)"
-          cp objs/nginx /tmp/nginx-linux-amd64
-          chmod +x /tmp/nginx-linux-amd64
-
-      - name: Upload release assets
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh release upload "${{ github.event.release.tag_name }}" \
-            /tmp/nginx-linux-amd64

.github/workflows/review-app-cleanup.yml

@@ -12,9 +12,6 @@ jobs:
   destroy_review_app:
     runs-on: ubuntu-latest
     steps:
-      - name: Cloning repo
-        uses: actions/checkout@v6
-
       - name: Destroy the review app
         uses: dokku/github-action@master
         with:

bin/ci-post-review-app-destroy

@@ -1,3 +0,0 @@
-#!/bin/sh -l
-
-echo "Running ci-post-review-app-destroy"

bin/compile

@@ -4,7 +4,7 @@ set -eo pipefail
 [[ $TRACE ]] && set -x
 
 # https://nginx.org/en/download.html
-NGINX_VERSION="1.29.8"
+NGINX_VERSION="1.29.3"
 NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
 # https://github.com/PCRE2Project/pcre2/releases
 PCRE_VERSION="10.47"
@@ -12,9 +12,8 @@ PCRE_TARBALL="pcre2-${PCRE_VERSION}.tar.gz"
 # https://github.com/gliderlabs/sigil/releases
 SIGIL_VERSION="0.11.5"
 # https://github.com/madler/zlib/releases
-ZLIB_VERSION="1.3.2"
+ZLIB_VERSION="1.3.1"
 ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"
-BUILDPACK_REPO="dokku/heroku-buildpack-nginx"
 
 suppress() {
   /bin/rm --force /tmp/surpress.out 2>/dev/null
@@ -53,34 +52,6 @@ fi
 
 cd "$CACHE_DIR"
 
-mkdir -p "$BUILD_DIR/sigil"
-if [[ ! -f "$BUILD_DIR/sigil/sigil-${SIGIL_VERSION}" ]]; then
-  echo "-----> Download and unzip sigil ${SIGIL_VERSION} via http"
-  curl -fsSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/sigil-linux-amd64" -o "$BUILD_DIR/sigil/sigil-${SIGIL_VERSION}"
-  cp "$BUILD_DIR/sigil/sigil-${SIGIL_VERSION}" "$BUILD_DIR/sigil/sigil"
-  chmod +x "$BUILD_DIR/sigil/sigil"
-fi
-
-if [[ ! -f "$BUILD_DIR/sigil/sigil" ]]; then
-  echo " !     Missing sigil binary"
-  exit 1
-fi
-
-if [[ -f "${CACHE_DIR}/bin/nginx" ]]; then
-  echo "-----> Reusing nginx binary from cache"
-  mkdir -p "$BUILD_DIR/nginx"
-  # shellcheck disable=SC2086
-  cp -r $CACHE_DIR/bin/* "$BUILD_DIR/nginx/"
-
-elif curl -fsSL "https://github.com/${BUILDPACK_REPO}/releases/latest/download/nginx-linux-amd64" -o /tmp/nginx-linux-amd64 2>/dev/null; then
-  echo "-----> Using precompiled nginx binary"
-  mkdir -p "$BUILD_DIR/nginx" "${CACHE_DIR}/bin"
-  chmod +x /tmp/nginx-linux-amd64
-  cp /tmp/nginx-linux-amd64 "$BUILD_DIR/nginx/nginx"
-  cp /tmp/nginx-linux-amd64 "${CACHE_DIR}/bin/nginx"
-  rm -f /tmp/nginx-linux-amd64
-
-else
 if [[ ! -d "${NGINX_TARBALL%.tar.gz}" ]]; then
   echo "-----> Download and unzip nginx ${NGINX_VERSION} via http"
   curl -sSL "https://nginx.org/download/${NGINX_TARBALL}" -o "${NGINX_TARBALL}"
@@ -99,7 +70,21 @@ else
   tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
 fi
 
+mkdir -p "$BUILD_DIR/sigil"
+if [[ ! -f "$BUILD_DIR/sigil/sigil-${SIGIL_VERSION}" ]]; then
+  echo "-----> Download and unzip sigil ${SIGIL_VERSION} via http"
+  curl -fsSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/sigil-linux-amd64" -o "$BUILD_DIR/sigil/sigil-${SIGIL_VERSION}"
+  cp "$BUILD_DIR/sigil/sigil-${SIGIL_VERSION}" "$BUILD_DIR/sigil/sigil"
+  chmod +x "$BUILD_DIR/sigil/sigil"
+fi
+
+if [[ ! -f "$BUILD_DIR/sigil/sigil" ]]; then
+  echo " !     Missing sigil binary"
+  exit 1
+fi
+
 cd "nginx-${NGINX_VERSION}"
+if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
   echo "-----> Compiling static nginx binary"
   mkdir "$BUILD_DIR/nginx"
   suppress ./configure \
@@ -145,6 +130,12 @@ else
   rm -rf "${CACHE_DIR:?}/bin" && mkdir -p "$CACHE_DIR/bin/"
   # shellcheck disable=SC2086
   cp -r $BUILD_DIR/nginx/* "$CACHE_DIR/bin/"
+
+else
+  echo "-----> Reusing nginx binary from cache"
+  mkdir -p "$BUILD_DIR/nginx"
+  # shellcheck disable=SC2086
+  cp -r $CACHE_DIR/bin/* "$BUILD_DIR/nginx/"
 fi
 
 # Update the PATH

conf/app-nginx.conf.sigil

@@ -24,6 +24,7 @@ http {
   types_hash_max_size 2048;
   include mime.types;
   charset UTF-8;
+  access_log stdout;
 
   server {
     listen {{ $.PORT }};