.gitea/workflows/push.yaml

@@ -2,47 +2,28 @@ name: push
 on:
   push:
     branches:
-      - master
+      - golang-ubuntu-latest
 jobs:
   build:
-    runs-on: golang-ubuntu-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
         uses: actions/checkout@focs
-      - name: Display Go version
-        run: go version
-      - name: Prepare
-        run: |
-          go env -w GO111MODULE=on
-          go env -w GOPROXY=https://goproxy.cn,direct
-          mkdir -p ~/.ssh
-          echo "${{ secrets.DEPLOY_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
-          echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519.pub
-          chmod 600 ~/.ssh/id_ed25519
-          chmod 600 ~/.ssh/id_ed25519.pub
-          ssh-keyscan -p 2222 focs.ji.sjtu.edu.cn >> ~/.ssh/known_hosts
-          ssh -T git@focs.ji.sjtu.edu.cn -p 2222
-        shell: bash
       - name: Determine build command
         id: build_command
         run: |
-          if echo "${{ gitea.event.head_commit.message }}" | grep -q "force build"; then
+          if echo "${{ github.event.head_commit.message }}" | grep -q "force build"; then
-            echo "build_command=make force-build" >> $GITEA_ENV
+            echo "build_command=make force-build" >> $GITHUB_ENV
           else
-            echo "build_command=make build" >> $GITEA_ENV
+            echo "build_command=make build" >> $GITHUB_ENV
           fi
       - name: Build
-        env:
-          TZ: Asia/Shanghai
         run: ${{ env.build_command }}
-      - name: Test
-        run: make test
       - name: Check images
         run: docker images
       - name: Remove dangling images
         run: docker image prune -f
       - name: Docker Login
-        run: |
+        run: "echo \"${{ secrets.DOCKER_PASSWORD }}\" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin focs.ji.sjtu.edu.cn:5000          \n"
-          echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin focs.ji.sjtu.edu.cn:5000
       - name: Docker Push
         run: make push

.gitignore

@@ -1,2 +0,0 @@
-/bin/joj3
-/bin/repo-health-checker

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "JOJ3"]
-	path = JOJ3
-	url = ssh://git@focs.ji.sjtu.edu.cn:2222/JOJ/JOJ3.git

Dockerfile

@@ -1,26 +1,22 @@
-FROM focs.ji.sjtu.edu.cn:5000/gitea/runner-images:ubuntu-latest-slim
+FROM focs.ji.sjtu.edu.cn:5000/gitea/runner-images:ubuntu-latest
 
-ENV TZ="Asia/Shanghai"
+ARG GO_VERSION=1.24.1
+ARG GOLANGCI_LINT_VERSION=1.64.8
+ENV PATH=$PATH:/usr/local/go/bin:/root/go/bin
 
-RUN sed -i s@/deb.debian.org/@/mirrors.tuna.tsinghua.edu.cn/@g /etc/apt/sources.list.d/debian.sources && \
+RUN sed -i s@/archive.ubuntu.com/@/mirrors.tuna.tsinghua.edu.cn/@g /etc/apt/sources.list && \
     apt-get update && \
-    apt-get install -y --no-install-recommends sudo python3-minimal python3-pip git git-lfs openssh-client rsync && \
+    apt-get install -y --no-install-recommends upx && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /var/lib/apt/lists/*
-    userdel -r node && \
-    useradd -u 1000 -ms /bin/bash tt && \
-    useradd -u 1001 -ms /bin/bash student && \
-    usermod -aG student tt && \
-    echo "student ALL=(tt) NOPASSWD:SETENV:/usr/local/bin/joj3,/usr/local/bin/joj3-forge-convert\ntt ALL=(student) NOPASSWD:SETENV:ALL" > /etc/sudoers.d/joj
 
-# install joint-teapot && joj3-forge
+RUN wget -q https://studygolang.com/dl/golang/go${GO_VERSION}.linux-amd64.tar.gz && \
-RUN pip install --no-cache-dir --break-system-packages \
+    rm -rf /usr/local/go && \
-    --index-url https://pypi.tuna.tsinghua.edu.cn/simple \
+    tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz && \
-    git+https://focs.ji.sjtu.edu.cn/git/JOJ/Joint-Teapot \
+    rm go${GO_VERSION}.linux-amd64.tar.gz
-    git+https://focs.ji.sjtu.edu.cn/git/JOJ/JOJ3-config-generator
 
-# install joj3 & repo-health-checker & joj3-forge-convert
+RUN wget -q https://ghfast.top/https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_LINT_VERSION}/golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64.tar.gz && \
-COPY bin/joj3 bin/repo-health-checker bin/joj3-forge-convert /usr/local/bin/
+    tar -C /tmp -xzf golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64.tar.gz && \
-
+    rm -rf golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64.tar.gz && \
-USER student
+    mkdir -p /root/go/bin && \
-WORKDIR /home/student
+    mv /tmp/golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64/golangci-lint /root/go/bin

JOJ3

@@ -1 +0,0 @@
-Subproject commit 0ea767264023f7ea5189d65ddd5c0d9f2e4d67ca

Makefile

@@ -1,25 +1,12 @@
-.PHONY: all prepare force-build build test push
+.PHONY: all force-build build push
-
-IMAGE_NAME := focs.ji.sjtu.edu.cn:5000/gitea/runner-images:focs-ubuntu-latest-slim
 
 all: build
 
-prepare:
+force-build:
-	git submodule update --init --remote
+	docker build --no-cache -t focs.ji.sjtu.edu.cn:5000/gitea/runner-images:golang-ubuntu-latest .
-	$(MAKE) -C JOJ3
-	cp JOJ3/build/joj3 JOJ3/build/repo-health-checker bin/
-	ls -lha bin
-	upx --best bin/joj3 bin/repo-health-checker
-	ls -lha bin
 
-force-build: prepare
+build:
-	docker build --no-cache -t $(IMAGE_NAME) .
+	docker build -t focs.ji.sjtu.edu.cn:5000/gitea/runner-images:golang-ubuntu-latest .
-
-build: prepare
-	docker build -t $(IMAGE_NAME) .
-
-test:
-	docker run --rm $(IMAGE_NAME) sudo -u tt -E joj3 --help
 
 push:
-	docker push $(IMAGE_NAME)
+	docker push focs.ji.sjtu.edu.cn:5000/gitea/runner-images:golang-ubuntu-latest

README.md

@@ -1,12 +1,3 @@
-# Runner Images
+# Runner Images with Golang
 
-FOCS docker images used by [act_runner](https://gitea.com/gitea/act_runner) to run workflows.
+Actions for this branch will build and push `focs.ji.sjtu.edu.cn:5000/gitea/runner-images:golang-ubuntu-latest` image.
-
-Check <https://gitea.com/gitea/runner-images> for information about base images.
-
-Actions for this branch will build and push `focs.ji.sjtu.edu.cn:5000/gitea/runner-images:focs-ubuntu-latest-slim` image.
-
-## Quick Start
-
-1. Put `joj3` into `/bin` or run `make prepare`
-2. `make build && make push` on a machine that can access `focs.ji.sjtu.edu.cn:5000`

bin/joj3-forge-convert

@@ -1,18 +0,0 @@
-#!/usr/bin/bash
-set -e
-COURSE=$1
-REPO_PATH=/home/tt/.cache/$COURSE-config
-GIT_USER=$(whoami)
-GIT_HOSTNAME=$(hostname -s)
-GIT_EMAIL="${GIT_USER}@${GIT_HOSTNAME}"
-git -C $REPO_PATH pull --rebase
-rsync -r --delete $REPO_PATH/home/tt/.config/ /home/tt/.config
-joj3-forge convert /home/tt/.config/joj
-rsync -r --delete /home/tt/.config/joj/ $REPO_PATH/home/tt/.config/joj
-git -C $REPO_PATH config user.name $GIT_USER
-git -C $REPO_PATH config user.email $GIT_EMAIL
-git -C $REPO_PATH add home/tt/.config/joj
-if ! git -C "$REPO_PATH" diff --staged --quiet; then
-    git -C $REPO_PATH commit -m "chore: joj3-forge convert"
-    git -C $REPO_PATH push
-fi