1
0
Fork 0

Compare commits

...

No commits in common. "master" and "main" have entirely different histories.
master ... main

9 changed files with 100 additions and 136 deletions

View file

@ -1,79 +0,0 @@
name: Docker image builds
on:
workflow_dispatch:
push:
branches: ["master"]
env:
DOCKER_METADATA_SET_OUTPUT_ENV: "true"
# permissions:
# contents: read
# packages: write
# attestations: write
# id-token: write
# pull-requests: write
jobs:
build:
runs-on: runner
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-tags: true
fetch-depth: 0
submodules: "recursive"
- name: Patch anubis
run: |
cd ./anubis
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
git am ../patches/*.patch || exit 1
- name: Install required package
run: |
sudo apt-get update -y
sudo apt-get install -y --no-install-recommends brotli esbuild
- name: Setup Go
uses: https://github.com/actions/setup-go@v5
with:
go-version: '>=1.24.0'
- name: Setup Ko
run: |
curl -sSfL "https://github.com/ko-build/ko/releases/download/v0.17.1/ko_0.17.1_Linux_x86_64.tar.gz" > ko.tar.gz
sudo tar xzf ko.tar.gz -C /usr/local/bin ko
- name: Log into registry
uses: docker/login-action@v3
with:
registry: git.nadeko.net
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: git.nadeko.net/fijxu/anubis
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
type=sha,prefix={{branch}}-
- name: Build and push
id: build
run: |
cd ./anubis
npm ci
npm run container
env:
DOCKER_REPO: git.nadeko.net/fijxu/anubis
SLOG_LEVEL: debug

4
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "anubis"]
path = anubis
[submodule "anubis-patches/anubis"]
path = anubis-patches/anubis
url = https://github.com/TecharoHQ/anubis

1
anubis

@ -1 +0,0 @@
Subproject commit 16145049223cfb68c7a98bfc2cf0ef56f7e28ff5

View file

@ -0,0 +1,97 @@
name: Docker image builds
on:
workflow_dispatch:
push:
branches: ["main"]
env:
DOCKER_METADATA_SET_OUTPUT_ENV: "true"
REGISTRY: git.nadeko.net
IMAGE_NAME: fijxu/anubis-modified
permissions:
contents: read
packages: write
attestations: write
id-token: write
pull-requests: write
jobs:
build:
runs-on: runner
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-tags: true
fetch-depth: 0
submodules: "recursive"
- name: Patch anubis
run: |
cd ./anubis
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
git am ../patches/*.patch
- name: Set up Homebrew
uses: github.com/Homebrew/actions/setup-homebrew@master
- name: Setup Homebrew cellar cache
uses: actions/cache@v4
with:
path: |
/home/linuxbrew/.linuxbrew/Cellar
/home/linuxbrew/.linuxbrew/bin
/home/linuxbrew/.linuxbrew/etc
/home/linuxbrew/.linuxbrew/include
/home/linuxbrew/.linuxbrew/lib
/home/linuxbrew/.linuxbrew/opt
/home/linuxbrew/.linuxbrew/sbin
/home/linuxbrew/.linuxbrew/share
/home/linuxbrew/.linuxbrew/var
key: ${{ runner.os }}-go-homebrew-cellar-${{ hashFiles('go.sum') }}
restore-keys: |
${{ runner.os }}-go-homebrew-cellar-
- name: Install Brew dependencies
run: |
brew bundle
- name: Log into registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.USERNAME }}
password: ${{ secrets.PASSWORD }}
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
type=sha,prefix={{branch}}-
- name: Build and push
id: build
run: |
npm ci
npm run container
env:
DOCKER_REPO: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
SLOG_LEVEL: debug
# I don't need this.
# - name: Generate artifact attestation
# uses: github.com/actions/attest-build-provenance@v2
# with:
# subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
# subject-digest: ${{ steps.build.outputs.digest }}
# push-to-registry: true

1
anubis-patches/anubis Submodule

@ -0,0 +1 @@
Subproject commit 52ca5390c2b54374e62cbcd2efaf78edaa4e7249

View file

@ -1,54 +0,0 @@
From 41e56a7922608b27ec50c35591223ea71afedad8 Mon Sep 17 00:00:00 2001
From: Fijxu <fijxu@nadeko.net>
Date: Sun, 30 Mar 2025 01:06:20 -0300
Subject: [PATCH] xess: change default background color
---
web/index_templ.go | 4 ++--
xess/xess.css | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/web/index_templ.go b/web/index_templ.go
index 2e3ac49..eb99b3a 100644
--- a/web/index_templ.go
+++ b/web/index_templ.go
@@ -251,7 +251,7 @@ func bench() templ.Component {
templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs("/.within.website/x/cmd/anubis/static/img/pensive.webp?cacheBuster=" +
anubis.Version)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 247, Col: 19}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 148, Col: 19}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
if templ_7745c5c3_Err != nil {
@@ -264,7 +264,7 @@ func bench() templ.Component {
var templ_7745c5c3_Var14 string
templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs("/.within.website/x/cmd/anubis/static/js/bench.mjs?cacheBuster=" + anubis.Version)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 250, Col: 118}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 151, Col: 118}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
if templ_7745c5c3_Err != nil {
diff --git a/xess/xess.css b/xess/xess.css
index 86cbd42..94c7deb 100644
--- a/xess/xess.css
+++ b/xess/xess.css
@@ -33,12 +33,12 @@ main {
}
body {
- background: #1d2021;
+ background: #181818;
color: #f9f5d7;
}
pre {
- background-color: #3c3836;
+ background-color: #181818;
padding: 1em;
border: 0;
font-family: Iosevka Curly Iaso, monospace;
--
2.49.0