aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Cleberg <[email protected]>2026-03-23 10:52:30 -0500
committerChristian Cleberg <[email protected]>2026-03-23 10:52:30 -0500
commite22aa788a5da78f62e9b25c666a6701582812856 (patch)
tree0e2ba1aa8f12df7f23244cf71fbf509377fad808
parentc5ddea05b5421a0abd549406f300dc5e3968e3c5 (diff)
downloadcleberg.net-e22aa788a5da78f62e9b25c666a6701582812856.tar.gz
cleberg.net-e22aa788a5da78f62e9b25c666a6701582812856.tar.bz2
cleberg.net-e22aa788a5da78f62e9b25c666a6701582812856.zip
migrate ci to sourcehut; add ruff to build.py
-rw-r--r--.build.yml (renamed from .builds/deploy.yml)2
-rw-r--r--.github/workflows/deploy.yml68
-rw-r--r--.github/workflows/docker-build.yml41
-rw-r--r--.github/workflows/ruff.yml42
-rw-r--r--Dockerfile31
5 files changed, 1 insertions, 183 deletions
diff --git a/.builds/deploy.yml b/.build.yml
index 62588ae..120780f 100644
--- a/.builds/deploy.yml
+++ b/.build.yml
@@ -11,7 +11,7 @@ sources:
- https://git.sr.ht/~ccleberg/cleberg.net
secrets:
- - <ssh-deploy-key-uuid> # ~/.ssh/id_rsa, has write access to server
+ - 303fbd30-2970-4d18-b88b-0f6abf822ea5
environment:
ENV: prod
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index 27edbc7..0000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-name: Build and Deploy
-
-on:
- push:
- branches:
- - main
- paths-ignore:
- - '.github/**'
- - 'screenshots/**'
- - 'utils/**'
- - 'LICENSE'
- - 'README.org'
-
-jobs:
- build-job:
- runs-on: ubuntu-latest
- container:
- image: ghcr.io/ccleberg/cleberg.net:main
-
- steps:
- - name: Checkout code
- uses: actions/checkout@v6
-
- - name: Run Build
- env:
- ENV: "prod"
- BUILD: "true"
- DEPLOY: "false"
- run: |
- echo "Environment is ready. Running build..."
- uv run build.py
-
- - name: Upload Build Artifacts
- uses: actions/upload-artifact@v6
- with:
- name: build-output
- path: ${{ github.workspace }}/.build/
- include-hidden-files: true
-
- deploy-job:
- runs-on: ubuntu-latest
- needs: build-job
- environment: production
- container:
- image: ghcr.io/ccleberg/cleberg.net:main
-
- steps:
- - name: Checkout code
- uses: actions/checkout@v6
-
- - name: Download Build Artifacts
- uses: actions/download-artifact@v6
- with:
- name: build-output
- path: ${{ github.workspace }}/.build/
-
- - name: Setup SSH and Deploy
- env:
- SERVER_IP: ${{ secrets.SERVER_IP }}
- SERVER_USER: ${{ secrets.SERVER_USER }}
- SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
- run: |
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
- rsync -avz --delete \
- -e "ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
- .build/ \
- $SERVER_USER@$SERVER_IP:/var/www/cleberg.net/
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
deleted file mode 100644
index b3d0455..0000000
--- a/.github/workflows/docker-build.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Build and Push Docker Image
-
-on:
- push:
- branches: [ "main" ]
- paths:
- - 'Dockerfile'
- - 'requirements.txt'
- - '.github/workflows/docker-build.yml'
-
-jobs:
- build:
- runs-on: ubuntu-latest
- permissions:
- contents: read
- packages: write
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v4
-
- - name: Log in to GHCR
- uses: docker/login-action@v3
- with:
- registry: ghcr.io
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Extract metadata
- id: meta
- uses: docker/metadata-action@v5
- with:
- images: ghcr.io/${{ github.repository }}
-
- - name: Build and push
- uses: docker/build-push-action@v5
- with:
- context: .
- push: true
- tags: ${{ steps.meta.outputs.tags }}
- labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
deleted file mode 100644
index 1c0fbea..0000000
--- a/.github/workflows/ruff.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Ruff
-
-on:
- push:
- branches: [ "main" ]
- paths:
- - '**.py'
- pull_request:
- branches: [ "main" ]
- paths:
- - '**.py'
-
-jobs:
- build:
- runs-on: ubuntu-latest
- strategy:
- matrix:
- python-version: ["3.x"]
- steps:
- - uses: actions/checkout@v4
- - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v5
- with:
- python-version: ${{ matrix.python-version }}
- ref: ${{ github.event.pull_request.head.ref }}
- - name: Install dependencies
- run: |
- python -m pip install --upgrade pip
- pip install pandas dash plotly.express
- - name: Install Ruff
- uses: astral-sh/[email protected]
- - name: Ruff Actions
- run: |
- ruff check --fix
- ruff format
- - name: Add and Commit
- uses: EndBug/add-and-commit@v9
- env:
- GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- default_author: github_actions
- pathspec_error_handling: ignore
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index de87df9..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM python:3.12-slim
-
-ENV DEBIAN_FRONTEND=noninteractive \
- HOMEBREW_NO_AUTO_UPDATE=1 \
- PATH="/home/linuxbrew/.linuxbrew/bin:${PATH}"
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
- curl \
- git \
- procps \
- build-essential \
- ca-certificates \
- openssh-client \
- && rm -rf /var/lib/apt/lists/*
-
-RUN useradd -m -s /bin/bash linuxbrew
-USER linuxbrew
-WORKDIR /home/linuxbrew
-
-RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-
-RUN brew install emacs rsync uv minify
-
-RUN mkdir -p ~/.config/emacs/.local/straight/repos && \
- cd ~/.config/emacs/.local/straight/repos && \
- git clone --depth 1 https://github.com/emacsorphanage/htmlize.git && \
- git clone --depth 1 https://github.com/emacs-love/templatel.git && \
- git clone --depth 1 https://github.com/emacs-love/weblorg.git
-
-USER root
-WORKDIR /builds