Replace progress site with decomp.dev

.github/README.md

@@ -1,9 +1,19 @@
-# Super Smash Bros Melee
-[![Code Progress](https://img.shields.io/endpoint?label=Code&url=https%3A%2F%2Fprogress.decomp.club%2Fdata%2Fmelee%2FGALE01%2Fdol%2F%3Fmode%3Dshield%26measure%3Dcode)](https://doldecomp.github.io/melee/progress/)
-[![Data Progress](https://img.shields.io/endpoint?label=Data&url=https%3A%2F%2Fprogress.decomp.club%2Fdata%2Fmelee%2FGALE01%2Fdol%2F%3Fmode%3Dshield%26measure%3Ddata)](https://doldecomp.github.io/melee/progress/)
-[![GC/Wii Decompilation](https://discordapp.com/api/guilds/727908905392275526/widget.png?style=shield)](https://discord.gg/hKx3FJJgrV)
-[![build](https://github.com/doldecomp/melee/actions/workflows/build.yml/badge.svg)](https://github.com/doldecomp/melee/actions/workflows/build.yml)
-[![publish-packages](https://github.com/doldecomp/melee/actions/workflows/publish-packages.yml/badge.svg)](https://github.com/doldecomp/melee/actions/workflows/publish-packages.yml)
+Super Smash Bros Melee \
+[![Build Status]][actions]
+[![Code Progress]][progress]
+[![Data Progress]][progress]
+[![Linked Progress]][progress]
+[![Discord Badge]][discord]
+=============
+
+[Build Status]: https://github.com/doldecomp/melee/actions/workflows/build.yml/badge.svg
+[actions]: https://github.com/doldecomp/melee/actions/workflows/build.yml
+[Code Progress]: https://decomp.dev/doldecomp/melee.svg?mode=shield&measure=code&label=Code&category=all
+[Data Progress]: https://decomp.dev/doldecomp/melee.svg?mode=shield&measure=data&label=Data&category=all
+[Linked Progress]: https://decomp.dev/doldecomp/melee.svg?mode=shield&measure=complete_code&label=Linked%20Code&category=all
+[Discord Badge]: https://img.shields.io/discord/933849697485983765?color=%237289DA&logo=discord&logoColor=%23FFFFFF
+[discord]: https://discord.gg/CWKqYMePX8
+[progress]: https://decomp.dev/doldecomp/melee
 
 This repo contains a WIP decompilation of Super Smash Bros Melee (US).
 

.github/packages/build-linux/Dockerfile

@@ -17,22 +17,21 @@ ENV PATH="$DEVKITPPC/bin:$PATH"
 COPY .github/packages/build-linux/melee-mwcc /usr/local/bin
 
 FROM linux-base AS linux-rw
-VOLUME [ "/input", "/output" ]
+VOLUME ["/input", "/output"]
 
 FROM linux-rw AS build-linux
 COPY .github/packages/build-linux/setup.sh /usr/local/bin
 RUN setup.sh
 ENV MAKE_FLAGS="GENERATE_MAP=1"
 COPY .github/packages/build-linux/entrypoint.sh /usr/local/bin
-ENTRYPOINT entrypoint.sh
+ENTRYPOINT ["entrypoint.sh"]
 
 FROM linux-rw AS gen-pages
 COPY .github/packages/gen-pages/setup.sh /usr/local/bin
-COPY tools/progress-site/package*.json /tmp
 COPY /reqs/gen-pages.txt /tmp/reqs/
 RUN setup.sh
 COPY .github/packages/gen-pages/entrypoint.sh /usr/local/bin
-ENTRYPOINT entrypoint.sh
+ENTRYPOINT ["entrypoint.sh"]
 
 # TODO
 FROM rust:latest AS check-issues
@@ -44,4 +43,4 @@ RUN setup.sh
 RUN rm -rf /input
 VOLUME [ "/input" ]
 COPY .github/packages/check-issues/entrypoint.sh /usr/local/bin
-ENTRYPOINT entrypoint.sh
+ENTRYPOINT ["entrypoint.sh"]

.github/packages/gen-pages/entrypoint.sh

@@ -22,36 +22,6 @@ melee-mwcc build/ctx.c -v -o build/ctx.o
 cp build/ctx.html /output/
 
 # Progress site
-cd /tmp/input/tools/progress-site
-
-src='/opt/assets/progress'
-static='static/extern'
-lib='src/lib/extern'
-
-# assets
-for file in "$src"/*; do
-    if [[ $(basename "$file") == 'favicon.png' ]]; then
-        dst="$static"
-    else
-        dst="$lib"
-    fi
-    cp "$file" "$dst"
-done
-
-# progress
-# BUG race condition between `build-melee` and `gen-pages`.
-progress_url='https://progress.decomp.club/data/melee/GALE01?format=json&mode=all'
-curl -s -L "$progress_url" -o "$lib/progress.json"
-
-# install
-cp -R /opt/node_modules .
-export npm_config_cache='npm-cache'
-npm install \
-    --no-audit \
-    --no-progress \
-    --prefer-offline
-
-# build
-npm run build
-find build -type f -name '.gitkeep' -delete
-mv build /output/progress
+
+mkdir /output/progress
+cp tools/progress-redirect.html /output/progress/index.html

.github/packages/gen-pages/setup.sh

@@ -3,39 +3,15 @@ set -euox pipefail
 
 apt update
 
-function install {
-    apt install -y --no-install-recommends "${@}"
-}
-
-install curl ca-certificates
-
-curl -L https://deb.nodesource.com/setup_20.x | bash -
-
-install \
+apt install -y --no-install-recommends \
+    ca-certificates \
+    curl \
     doxygen \
     git \
     libarchive-tools \
-    nodejs \
     python-is-python3 \
     python3-full
 
-# Acquire external assets
-git clone --no-checkout --depth=1 \
-    'https://github.com/doldecomp/assets.git' \
-    /tmp/assets
-pushd /tmp/assets
-git sparse-checkout init --cone
-git sparse-checkout set melee
-git checkout
-mv melee /opt/assets
-popd
-
-# Install progress site node modules
-pushd /tmp
-npm install --no-audit --no-progress
-mv node_modules /opt
-popd
-
 # Create and update Python venv
 python -m venv --upgrade-deps /opt/venv
 . /opt/venv/bin/activate
@@ -52,6 +28,5 @@ apt remove -y \
     libarchive-tools
 apt autoremove -y
 apt clean
-npm cache clean --force
 rm -rf /var/lib/apt/lists/*
 rm -rf /tmp/*

tools/progress-redirect.html

@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Redirecting to https://decomp.dev/doldecomp/melee</title>
+<meta http-equiv="refresh" content="0; URL=https://decomp.dev/doldecomp/melee">
+<link rel="canonical" href="https://decomp.dev/doldecomp/melee">