split into block and add pr preview

.github/workflows/build.yml

@@ -0,0 +1,61 @@
+name: Docker Build Reusable
+
+on:
+  workflow_call:
+    inputs:
+      push:
+        required: false
+        type: boolean
+        default: false
+      nginx_version:
+        required: true
+        type: string
+      tags:
+        required: true
+        type: string
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          install: true
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v4
+        if: inputs.push
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v4
+        if: inputs.push
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker Labels
+        id: meta
+        uses: docker/metadata-action@v6
+        with:
+          images: |
+            cupcakearmy/static
+            ghcr.io/${{ github.repository }}
+          tags: ${{ inputs.tags }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: ${{ inputs.push }}
+          platforms: linux/amd64,linux/arm64
+          build-args: NGINX=${{ inputs.nginx_version }}
+          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/cron.yml

@@ -3,65 +3,19 @@ name: Matrix Cron Build
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 3 * * 1"
+    - cron: '0 3 * * 1'
 
 jobs:
   tags:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.fetcher.outputs.matrix }}
-    defaults:
-      run:
-        working-directory: tags
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - run: npm i
-      - id: fetcher
-        run: node .
+    uses: ./.github/workflows/tags.yml
 
   build:
-    runs-on: ubuntu-latest
     needs: tags
     strategy:
       matrix: ${{fromJson(needs.tags.outputs.matrix)}}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          install: true
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Docker Labels
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            cupcakearmy/static
-            ghcr.io/${{ github.repository }}
-          tags: ${{ matrix.tags }}
-
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          build-args: NGINX=${{ matrix.version }}
-          tags: ${{ steps.meta.outputs.tags }}
+    uses: ./.github/workflows/build.yml
+    with:
+      push: true
+      nginx_version: ${{ matrix.version }}
+      tags: ${{ matrix.tags }}
+    secrets: inherit

.github/workflows/pr.yml

@@ -0,0 +1,18 @@
+name: PR Build
+
+on:
+  pull_request:
+
+jobs:
+  tags:
+    uses: ./.github/workflows/tags.yml
+
+  build:
+    needs: tags
+    strategy:
+      matrix: ${{fromJson(needs.tags.outputs.matrix)}}
+    uses: ./.github/workflows/build.yml
+    with:
+      push: false
+      nginx_version: ${{ matrix.version }}
+      tags: ${{ matrix.tags }}

.github/workflows/tags.yml

@@ -0,0 +1,23 @@
+name: Fetch Nginx Tags
+
+on:
+  workflow_call:
+    outputs:
+      matrix:
+        description: JSON matrix of nginx versions and docker tags
+        value: ${{ jobs.fetch.outputs.matrix }}
+
+jobs:
+  fetch:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.fetcher.outputs.matrix }}
+    defaults:
+      run:
+        working-directory: tags
+    steps:
+      - uses: actions/checkout@v4
+      - uses: oven-sh/setup-bun@v2
+      - run: bun i
+      - id: fetcher
+        run: bun .

Dockerfile

@@ -1,12 +1,11 @@
 # BUILDER
-FROM alpine AS builder
+FROM alpine:3 AS builder
 
-ARG DEP_DEV="alpine-sdk zlib-dev pcre-dev openssl-dev gd-dev"
+ARG DEP_DEV="alpine-sdk zlib-dev pcre-dev openssl-dev gd-dev curl"
 RUN apk add --no-cache ${DEP_DEV}
 
-
 WORKDIR /build
-ARG NGINX=1.21.6
+ARG NGINX
 RUN curl https://nginx.org/download/nginx-${NGINX}.tar.gz | tar xz
 RUN mv nginx-${NGINX} nginx
 RUN git clone --recursive https://github.com/google/ngx_brotli.git
@@ -19,7 +18,7 @@ RUN make install
 
 
 # RUNNER
-FROM alpine
+FROM alpine:3
 
 ARG DEP_RUN="pcre openssl gd tzdata"
 

tags/README.md

@@ -0,0 +1,15 @@
+# tags
+
+To install dependencies:
+
+```bash
+bun install
+```
+
+To run:
+
+```bash
+bun run index.js
+```
+
+This project was created using `bun init` in bun v1.1.20. [Bun](https://bun.sh) is a fast all-in-one JavaScript runtime.

tags/bun.lock

@@ -0,0 +1,47 @@
+{
+  "lockfileVersion": 1,
+  "configVersion": 1,
+  "workspaces": {
+    "": {
+      "dependencies": {
+        "@actions/core": "latest",
+        "semver": "latest",
+      },
+      "devDependencies": {
+        "@tsconfig/strictest": "latest",
+        "@types/bun": "latest",
+        "@types/semver": "latest",
+        "typescript": "latest",
+      },
+    },
+  },
+  "packages": {
+    "@actions/core": ["@actions/core@3.0.1", "", { "dependencies": { "@actions/exec": "^3.0.0", "@actions/http-client": "^4.0.0" } }, "sha512-a6d/Nwahm9fliVGRhdhofo40HjHQasUPusmc7vBfyky+7Z+P2A1J68zyFVaNcEclc/Se+eO595oAr5nwEIoIUA=="],
+
+    "@actions/exec": ["@actions/exec@3.0.0", "", { "dependencies": { "@actions/io": "^3.0.2" } }, "sha512-6xH/puSoNBXb72VPlZVm7vQ+svQpFyA96qdDBvhB8eNZOE8LtPf9L4oAsfzK/crCL8YZ+19fKYVnM63Sl+Xzlw=="],
+
+    "@actions/http-client": ["@actions/http-client@4.0.1", "", { "dependencies": { "tunnel": "^0.0.6", "undici": "^6.23.0" } }, "sha512-+Nvd1ImaOZBSoPbsUtEhv+1z99H12xzncCkz0a3RuehINE81FZSe2QTj3uvAPTcJX/SCzUQHQ0D1GrPMbrPitg=="],
+
+    "@actions/io": ["@actions/io@3.0.2", "", {}, "sha512-nRBchcMM+QK1pdjO7/idu86rbJI5YHUKCvKs0KxnSYbVe3F51UfGxuZX4Qy/fWlp6l7gWFwIkrOzN+oUK03kfw=="],
+
+    "@tsconfig/strictest": ["@tsconfig/strictest@2.0.8", "", {}, "sha512-XnQ7vNz5HRN0r88GYf1J9JJjqtZPiHt2woGJOo2dYqyHGGcd6OLGqSlBB6p1j9mpzja6Oe5BoPqWmeDx6X9rLw=="],
+
+    "@types/bun": ["@types/bun@1.3.14", "", { "dependencies": { "bun-types": "1.3.14" } }, "sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw=="],
+
+    "@types/node": ["@types/node@26.0.1", "", { "dependencies": { "undici-types": "~8.3.0" } }, "sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw=="],
+
+    "@types/semver": ["@types/semver@7.7.1", "", {}, "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA=="],
+
+    "bun-types": ["bun-types@1.3.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ=="],
+
+    "semver": ["semver@7.8.5", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="],
+
+    "tunnel": ["tunnel@0.0.6", "", {}, "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="],
+
+    "typescript": ["typescript@6.0.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw=="],
+
+    "undici": ["undici@6.27.0", "", {}, "sha512-YmfV3YnEDzXRC5lZ2jWtWWHKGUm1zIt8AhesR1tens+HTNv+YZlN/dp6G727LOvMJ8xjP9Be7Y2Sdr96LDm+pg=="],
+
+    "undici-types": ["undici-types@8.3.0", "", {}, "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ=="],
+  }
+}

tags/index.ts

@@ -1,4 +1,4 @@
-import { info, setOutput } from '@actions/core'
+import { info, setOutput, setFailed } from '@actions/core'
 import semver from 'semver'
 
 // Fetch the current versions from the download page
@@ -9,17 +9,27 @@ const html = await fetch(URL).then((r) => r.text())
 const re = /"\/download\/nginx-(\d+\.){3}tar\.gz"/g
 const matches = html.match(re)
 
+if (!matches) {
+  setFailed(`No versions found at ${URL}`)
+  process.exit(1)
+}
+
 // Clean up the matches to semver format
-function clean(match) {
+function clean(match: string): string {
   return match.replace(/"/g, '').replace('/download/nginx-', '').replace('.tar.gz', '')
 }
 const versions = matches.map(clean)
 
 // Filter
 // Get the two most up to date versions, mainline and stable
-const filtered = versions.sort(semver.rcompare).slice(0, 2)
+const [mainline, stable] = versions.sort(semver.rcompare).slice(0, 2)
 
-function convert(version, additional = []) {
+if (!mainline || !stable) {
+  setFailed(`Could not find mainline and stable versions`)
+  process.exit(1)
+}
+
+function convert(version: string, additional: string[] = []) {
   return {
     version,
     // https://github.com/docker/metadata-action#typeraw
@@ -30,7 +40,7 @@ function convert(version, additional = []) {
 // Export as github action matrix
 // https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#expanding-or-adding-matrix-configurations
 const githubActionMatrix = {
-  include: [convert(filtered[0], ['latest', 'mainline']), convert(filtered[1], ['stable'])],
+  include: [convert(mainline, ['latest', 'mainline']), convert(stable, ['stable'])],
 }
 
 const serialised = JSON.stringify(githubActionMatrix)

tags/mise.toml

@@ -0,0 +1,2 @@
+[tools]
+bun = "latest"

tags/package.json

@@ -1,8 +1,17 @@
 {
   "type": "module",
-  "main": "index.js",
+  "main": "index.ts",
+  "scripts": {
+    "fetch": "bun index.ts"
+  },
+  "dependencies": {
+    "@actions/core": "^3.0.1",
+    "semver": "^7.8.5"
+  },
   "devDependencies": {
-    "@actions/core": "^1.10.0",
-    "semver": "^7.3.8"
+    "@tsconfig/strictest": "^2.0.8",
+    "@types/bun": "^1.3.14",
+    "@types/semver": "^7.7.1",
+    "typescript": "^6.0.3"
   }
 }

tags/pnpm-lock.yaml

@@ -1,53 +0,0 @@
-lockfileVersion: 5.4
-
-specifiers:
-  '@actions/core': ^1.10.0
-  semver: ^7.3.8
-
-devDependencies:
-  '@actions/core': 1.10.0
-  semver: 7.3.8
-
-packages:
-
-  /@actions/core/1.10.0:
-    resolution: {integrity: sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==}
-    dependencies:
-      '@actions/http-client': 2.0.1
-      uuid: 8.3.2
-    dev: true
-
-  /@actions/http-client/2.0.1:
-    resolution: {integrity: sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==}
-    dependencies:
-      tunnel: 0.0.6
-    dev: true
-
-  /lru-cache/6.0.0:
-    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
-    engines: {node: '>=10'}
-    dependencies:
-      yallist: 4.0.0
-    dev: true
-
-  /semver/7.3.8:
-    resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
-    engines: {node: '>=10'}
-    hasBin: true
-    dependencies:
-      lru-cache: 6.0.0
-    dev: true
-
-  /tunnel/0.0.6:
-    resolution: {integrity: sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==}
-    engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'}
-    dev: true
-
-  /uuid/8.3.2:
-    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
-    hasBin: true
-    dev: true
-
-  /yallist/4.0.0:
-    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
-    dev: true

tags/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "@tsconfig/strictest",
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+  },
+}