Merge branch 'main' into portal-merged

# Conflicts:
#	Sources/App/Core/SiteURL.swift

Author: daveverwer

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/finestructure/spi-base:1.1.0
+FROM registry.gitlab.com/finestructure/spi-base:1.1.1
 
 # Install SPM build dependencies
 RUN apt-get update && apt-get install -y curl git make unzip \

.env.development.template

@@ -3,3 +3,4 @@ DATABASE_PORT=6432
 DATABASE_NAME=spi_dev
 DATABASE_USERNAME=spi_dev
 DATABASE_PASSWORD=xxx
+REDIS_HOST=localhost

.env.testing.template

@@ -3,3 +3,4 @@ DATABASE_PORT=5432
 DATABASE_NAME=spi_test
 DATABASE_USERNAME=spi_test
 DATABASE_PASSWORD=xxx
+REDIS_HOST=localhost

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     container:
-      image: registry.gitlab.com/finestructure/spi-base:1.1.0
+      image: registry.gitlab.com/finestructure/spi-base:1.1.1
       options: --privileged
     services:
       postgres:
@@ -60,6 +60,21 @@ jobs:
           DATABASE_HOST: postgres
           DATABASE_PORT: '5432'
 
+  release-build-linux:
+    name: Release build
+    runs-on: ubuntu-latest
+    container:
+      image: registry.gitlab.com/finestructure/spi-base:1.1.1
+      options: --privileged
+    steps:
+      - name: GH Runner bug workaround
+        run: sysctl -w vm.mmap_rnd_bits=28
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with: { 'fetch-depth': 0 }
+      - name: Build release
+        run: swift build -c release --static-swift-stdlib -Xlinker -ljemalloc
+
   # test-macos:
   #   name: Test macOS
   #   runs-on: macOS-latest

.github/workflows/query-performance.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     container:
-      image: registry.gitlab.com/finestructure/spi-base:1.1.0
+      image: registry.gitlab.com/finestructure/spi-base:1.1.1
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.gitlab-ci.yml

@@ -176,7 +176,13 @@ smoke-test:
     - spi-server-deploy
   script: |
     rester() {
-      docker run --rm -t -e base_url="$SITE_URL" -e api_token="$api_token" -v $PWD:/host -w /host finestructure/rester:0.8.1 "$1"
+      docker run --rm -t \
+        -e base_url="$SITE_URL" \
+        -e api_token="$api_token" \
+        -e smoke_test_token="$SMOKE_TEST_TOKEN" \
+        -v $PWD:/host \
+        -w /host \
+        finestructure/rester:0.8.1 "$1"
     }
     echo Testing with SITE_URL: ${SITE_URL}
     rester restfiles/smoke-test.restfile
@@ -190,7 +196,12 @@ doc-test:
     - spi-server-deploy
   script: |
     rester() {
-      docker run --rm -t -e base_url="$SITE_URL" -v $PWD:/host -w /host finestructure/rester:0.8.1 "$1"
+      docker run --rm -t \
+        -e base_url="$SITE_URL" \
+        -e smoke_test_token="$SMOKE_TEST_TOKEN" \
+        -v $PWD:/host \
+        -w /host \
+        finestructure/rester:0.8.1 "$1"
     }
     echo Testing with SITE_URL: ${SITE_URL}
     rester restfiles/doc-test.restfile

Dockerfile

@@ -18,7 +18,7 @@
 # ================================
 # Build image
 # ================================
-FROM registry.gitlab.com/finestructure/spi-base:1.1.0 as build
+FROM registry.gitlab.com/finestructure/spi-base:1.1.1 as build
 
 # Set up a build area
 WORKDIR /build
@@ -61,7 +61,7 @@ RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w
 # ================================
 # Run image
 # ================================
-FROM registry.gitlab.com/finestructure/spi-base:1.1.0
+FROM registry.gitlab.com/finestructure/spi-base:1.1.1
 
 # NB sas 2022-09-23: We're not using a dedicated `vapor` user to run the executable, because it
 # makes managing the data in the checkouts volume difficult. See

FrontEnd/docc.scss

@@ -22,17 +22,8 @@ header.spi,
 footer.spi {
     position: sticky;
     width: 100%;
-    font-family:
-        -apple-system,
-        BlinkMacSystemFont,
-        'SF Hello',
-        'Segoe UI',
-        Roboto,
-        'Helvetica Neue',
-        Arial,
-        sans-serif,
-        'Apple Color Emoji',
-        'Segoe UI Emoji' !important;
+    font-family: -apple-system, BlinkMacSystemFont, 'SF Hello', 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif,
+        'Apple Color Emoji', 'Segoe UI Emoji' !important;
     font-size: 16px;
     line-height: 1.4;
     color: var(--header-text);
@@ -191,9 +182,9 @@ header.spi {
     span.stable,
     span.beta,
     span.branch {
-        padding-left: 18px;
+        padding-left: 16px;
         font-weight: 600;
-        background-position: top 2px left;
+        background-position: center left;
         background-repeat: no-repeat;
         background-size: 14px;
     }
@@ -209,6 +200,22 @@ header.spi {
     span.branch {
         background-image: var(--image-branch);
     }
+
+    .reference {
+        display: inline-flex;
+        gap: 4px;
+        align-items: center;
+        justify-content: center;
+
+        .badge {
+            padding: 2px 4px;
+            font-size: 10px;
+            text-align: center;
+            color: var(--header-text);
+            background-color: rgba(255, 255, 255, 20%);
+            border-radius: 4px;
+        }
+    }
 }
 
 footer.spi {

FrontEnd/scripts/debug_panel.js

@@ -76,11 +76,11 @@ export class SPIDebugPanel extends HTMLElement {
     }
 
     addCanonicalUrls() {
-        const canonicalUrl = document.querySelector('link[rel="canonical"]').href
+        const canonicalUrl = document.querySelector('link[rel="canonical"]')?.href
         const windowUrl = window.location.href
         const matchingCanonicalUrl = canonicalUrl === windowUrl
 
-        this.newTableRow('Canonical URL', canonicalUrl)
+        this.newTableRow('Canonical URL', canonicalUrl ? canonicalUrl : 'Missing', canonicalUrl ? null : 'red')
         this.newTableRow('Window URL', windowUrl)
         this.newTableRow('Canonical Match', matchingCanonicalUrl, matchingCanonicalUrl ? 'green' : 'red')
     }

FrontEnd/styles/colors.scss

@@ -191,6 +191,9 @@
     --debug-console-background: var(--light-blue);
     --debug-console-border: var(--grey);
     --debug-console-button-hover: var(--light-grey);
+
+    --custom-collections-badge-background: var(--light-grey);
+    --custom-collections-badge-text: var(--dark-grey);
 }
 
 // Dark mode.
@@ -317,5 +320,8 @@
         --debug-console-background: var(--dark-blue);
         --debug-console-border: var(--light-grey);
         --debug-console-button-hover: var(--dark-grey);
+
+        --custom-collections-badge-background: var(--dark-grey);
+        --custom-collections-badge-text: var(--light-grey);
     }
 }