fixup ci

.github/workflows/main.yml

@@ -2,14 +2,23 @@ name: CI
 
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
 jobs:
-  docs:
+  build:
+    uses: mhils/workflows/.github/workflows/gh-pages-hugo.yml@v8
+    with:
+      deploy: false
+      working-directory: src
+    permissions:
+      contents: read
+      id-token: write
+      pages: write
+  lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - run: |
-          wget https://github.com/gohugoio/hugo/releases/download/v0.87.0/hugo_extended_0.87.0_Linux-64bit.deb
-          sudo dpkg -i hugo*.deb
       - run: |
           wget https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
           sudo mv jq-linux64 /usr/local/bin/jq

ci.sh

@@ -5,4 +5,29 @@ set -o pipefail
 set -o nounset
 # set -o xtrace
 
-./build.sh
+cd src
+
+# check for valid JSON
+cat assets/data/publications.json | jq empty
+
+# check for existing publication types
+allowed_types=$(cat <<-MOT
+blog post
+media
+research
+talk
+MOT
+)
+types=$(cat assets/data/publications.json | jq -r '.[].type' | sort | uniq)
+
+if [[ ${types} != ${allowed_types} ]]; then
+  echo "Found invalid publication type!"
+  exit 1
+fi
+
+conference_missing=$(cat assets/data/publications.json | jq '.[] | select(.type =="research") | select(.conference == null)')
+if [ -n "$conference_missing" ]; then
+  echo "Research artifact without conference!"
+  echo "$conference_missing"
+  exit 1
+fi

src/config.toml

@@ -2,7 +2,6 @@ baseURL = "https://mitmproxy.org/"
 languageCode = "en-us"
 title = "mitmproxy.org"
 theme = "mitmproxy"
-publishDir = "../public"
 relativeURLs = true
 
 [params]

src/content/posts/local-redirect/macos/index.md

@@ -19,8 +19,8 @@ without fiddling with any proxy settings.
 mentored by [Maximilian Hils]. In this post I will present the implementation of a macOS Network Extension 
 to transparently intercept macOS traffic![^source]*
 
-[Emanuele Micheletti]: {{< ref "authors/emanuele-micheletti" >}}
-[Maximilian Hils]:  {{< ref "authors/maximilian-hils" >}}
+[Emanuele Micheletti]: {{< ref "/authors/emanuele-micheletti" >}}
+[Maximilian Hils]:  {{< ref "/authors/maximilian-hils" >}}
 [^source]: You can find the source code for this not in the main mitmproxy repository, but over at https://github.com/mitmproxy/mitmproxy_rs!
 
 ## The Problem: Transparent Proxies are Hard

src/content/posts/releases/mitmproxy-10.1/index.md

@@ -20,8 +20,8 @@ In the spirit of shipping more frequently, this release brings exactly one new m
 mentored by [Maximilian Hils]. My project was to implement the [import and export](https://github.com/mitmproxy/mitmproxy/commits?author=stanleygvi) 
 functionality for HAR files in mitmproxy.*
 
-[Nathaniel Good]: {{< ref "authors/nathaniel-good" >}}
-[Maximilian Hils]:  {{< ref "authors/maximilian-hils" >}}
+[Nathaniel Good]: {{< ref "/authors/nathaniel-good" >}}
+[Maximilian Hils]:  {{< ref "/authors/maximilian-hils" >}}
 
 ## Background: HAR files
 

src/content/posts/releases/mitmproxy-10.4/index.md

@@ -18,8 +18,8 @@ Work is still underway as part of this year's Google Summer of Code, but a first
 
 *Hi! My name is [Matteo Luppi], and I’m one of this year’s GSoC students for mitmproxy. Under the mentorship of [Maximilian Hils], my primary focus has been on enhancing mitmweb. In this blog post, I’ll introduce you to our new Capture tab page in mitmweb.*
 
-[Matteo Luppi]: {{< ref "authors/matteo-luppi" >}}
-[Maximilian Hils]:  {{< ref "authors/maximilian-hils" >}}
+[Matteo Luppi]: {{< ref "/authors/matteo-luppi" >}}
+[Maximilian Hils]:  {{< ref "/authors/maximilian-hils" >}}
 
 ## New Capture Tab
 

src/content/posts/releases/mitmproxy-5.3/index.md

@@ -17,7 +17,7 @@ We are excited to announce the release of [mitmproxy 5.3](https://github.com/mit
 With the recent release of Python 3.9, obviously we had to bump our list of
 supported Python versions and now fully support 3.6, 3.7, 3.8, and 3.9!
 
-As part of this years Google Summer of Code contribution from [Martin Plattner]({{< ref "authors/martin-plattner" >}}), we now have amazing
+As part of this years Google Summer of Code contribution from [Martin Plattner]({{< ref "/authors/martin-plattner" >}}), we now have amazing
 beginner tutorials as part of our documentation! And the best thing: it is made
 as [Tutorial as
 Code](https://github.com/mitmproxy/mitmproxy/blob/aca7284ab64783531193d013e3685864cac8f339/docs/scripts/clirecording/screenplays.py),

src/content/posts/wireguard-mode/index.md

@@ -92,7 +92,7 @@ This project would not have been possible if not for the great ecosystem of exis
 programming (tokio), low-level networking functionality (boringtun, smoltcp), and bridging the gap between Rust and
 Python (pyo3, pyo3-log, pyo3-asyncio, maturin).
 
-I would also like to thank [Maximilian Hils]({{< ref "authors/maximilian-hils" >}}) for his mentorship and for supervising
+I would also like to thank [Maximilian Hils]({{< ref "/authors/maximilian-hils" >}}) for his mentorship and for supervising
 my Bachelor thesis --- which, coincidentally, will be about "Implementing a WireGuard frontend for mitmproxy". 🙃
 
 

upload-prod.sh

@@ -7,6 +7,6 @@ set -o nounset
 
 aws configure set preview.cloudfront true
 aws --profile mitmproxy \
-    s3 sync --acl public-read ./public s3://www.mitmproxy.org/
+    s3 sync --acl public-read ./src/public s3://www.mitmproxy.org/
 aws --profile mitmproxy \
     cloudfront create-invalidation --distribution-id E18EVZZRMM1SSD --paths "/*"

upload-test.sh

@@ -7,6 +7,6 @@ set -o nounset
 
 aws configure set preview.cloudfront true
 aws --profile mitmproxy \
-    s3 sync --acl public-read ./public s3://www-test.mitmproxy.org/
+    s3 sync --acl public-read ./src/public s3://www-test.mitmproxy.org/
 aws --profile mitmproxy \
     cloudfront create-invalidation --distribution-id E3UCZ4MLN4TO7U --paths "/*"