Compare commits
No commits in common. "joj-repo" and "master" have entirely different histories.
48
.gitea/workflows/push.yaml
Normal file
48
.gitea/workflows/push.yaml
Normal file
|
|
@ -0,0 +1,48 @@
|
||||||
|
name: push
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: golang-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
|
||||||
|
echo "build_command=make force-build" >> $GITEA_ENV
|
||||||
|
else
|
||||||
|
echo "build_command=make build" >> $GITEA_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: |
|
||||||
|
echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin focs.ji.sjtu.edu.cn:5000
|
||||||
|
- name: Docker Push
|
||||||
|
run: make push
|
||||||
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,2 +1,2 @@
|
||||||
.tags
|
/bin/joj3
|
||||||
.tags.*
|
/bin/repo-health-checker
|
||||||
|
|
|
||||||
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
[submodule "JOJ3"]
|
||||||
|
path = JOJ3
|
||||||
|
url = ssh://git@focs.ji.sjtu.edu.cn:2222/JOJ/JOJ3.git
|
||||||
26
Dockerfile
Normal file
26
Dockerfile
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
FROM focs.ji.sjtu.edu.cn:5000/gitea/runner-images:ubuntu-latest-slim
|
||||||
|
|
||||||
|
ENV TZ="Asia/Shanghai"
|
||||||
|
|
||||||
|
RUN sed -i s@/deb.debian.org/@/mirrors.tuna.tsinghua.edu.cn/@g /etc/apt/sources.list.d/debian.sources && \
|
||||||
|
apt-get update && \
|
||||||
|
apt-get install -y --no-install-recommends sudo python3-minimal python3-pip git git-lfs openssh-client rsync && \
|
||||||
|
apt-get clean && \
|
||||||
|
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 pip install --no-cache-dir --break-system-packages \
|
||||||
|
--index-url https://pypi.tuna.tsinghua.edu.cn/simple \
|
||||||
|
git+https://focs.ji.sjtu.edu.cn/git/JOJ/Joint-Teapot \
|
||||||
|
git+https://focs.ji.sjtu.edu.cn/git/JOJ/JOJ3-config-generator
|
||||||
|
|
||||||
|
# install joj3 & repo-health-checker & joj3-forge-convert
|
||||||
|
COPY bin/joj3 bin/repo-health-checker bin/joj3-forge-convert /usr/local/bin/
|
||||||
|
|
||||||
|
USER student
|
||||||
|
WORKDIR /home/student
|
||||||
1
JOJ3
Submodule
1
JOJ3
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 0ea767264023f7ea5189d65ddd5c0d9f2e4d67ca
|
||||||
25
Makefile
Normal file
25
Makefile
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
.PHONY: all prepare force-build build test push
|
||||||
|
|
||||||
|
IMAGE_NAME := focs.ji.sjtu.edu.cn:5000/gitea/runner-images:focs-ubuntu-latest-slim
|
||||||
|
|
||||||
|
all: build
|
||||||
|
|
||||||
|
prepare:
|
||||||
|
git submodule update --init --remote
|
||||||
|
$(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
|
||||||
|
docker build --no-cache -t $(IMAGE_NAME) .
|
||||||
|
|
||||||
|
build: prepare
|
||||||
|
docker build -t $(IMAGE_NAME) .
|
||||||
|
|
||||||
|
test:
|
||||||
|
docker run --rm $(IMAGE_NAME) sudo -u tt -E joj3 --help
|
||||||
|
|
||||||
|
push:
|
||||||
|
docker push $(IMAGE_NAME)
|
||||||
12
README.md
Normal file
12
README.md
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
# Runner Images
|
||||||
|
|
||||||
|
FOCS docker images used by [act_runner](https://gitea.com/gitea/act_runner) to run workflows.
|
||||||
|
|
||||||
|
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`
|
||||||
18
bin/joj3-forge-convert
Executable file
18
bin/joj3-forge-convert
Executable file
|
|
@ -0,0 +1,18 @@
|
||||||
|
#!/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
|
||||||
103
joj-repo
103
joj-repo
|
|
@ -1,103 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
GITEA="ssh://git@focs.ji.sjtu.edu.cn:2222"
|
|
||||||
ORG=${GITHUB_ACTION_REPOSITORY%/*}
|
|
||||||
COURSE=${ORG/-*}
|
|
||||||
|
|
||||||
LXCHOST="tt@172.17.0.1"
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# parse commit message
|
|
||||||
#
|
|
||||||
parse_commit() {
|
|
||||||
|
|
||||||
message=$(git log -1 --pretty=format:%s ${GITHUB_WORKFLOW_SHA})
|
|
||||||
|
|
||||||
# add empty scope if none provided, then split "type(scope): message"
|
|
||||||
OLDIFS=$IFS; IFS=$'\n'
|
|
||||||
commit=( $(sed 's/\(^[^(]*\):/\1( ):/g; s/\([^(]*\)(\?\([^)]*\))\?: \(.*\)/\1\n\2\n\3/g' <<< ${message}) )
|
|
||||||
IFS=$OLDIFS
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# gen
|
|
||||||
#
|
|
||||||
generate_json() {
|
|
||||||
|
|
||||||
parse_commit
|
|
||||||
for i in ${commit[1]}; do
|
|
||||||
echo joj-conf-generator $HOME/.config/joj/$i
|
|
||||||
done
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# initial repo/config setup
|
|
||||||
#
|
|
||||||
init() {
|
|
||||||
|
|
||||||
# backup current grading scoreboard
|
|
||||||
[ -d $COURSE-joj ] && backup $COURSE-joj
|
|
||||||
|
|
||||||
git clone $GITEA/$ORG/$COURSE-joj.git
|
|
||||||
|
|
||||||
cd $COURSE-config
|
|
||||||
|
|
||||||
# check existence of grading branch
|
|
||||||
git branch -a | grep -q grading && br=1
|
|
||||||
|
|
||||||
# clone grading branch or create one + push readme
|
|
||||||
if [ "x$br" = "x1" ]; then
|
|
||||||
git switch grading
|
|
||||||
git pull
|
|
||||||
else
|
|
||||||
git switch --orphan grading
|
|
||||||
|
|
||||||
echo "# $COURSE JOJ grading" > Readme.md
|
|
||||||
echo "This branch is automatically updated by JOJ, **never edit any file in this branch!**" >> Readme.md
|
|
||||||
|
|
||||||
git add Readme.md
|
|
||||||
git commit -m"docs: readme"
|
|
||||||
git push
|
|
||||||
fi
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# update config repo + copy config files
|
|
||||||
#
|
|
||||||
update() {
|
|
||||||
|
|
||||||
[ -d "$COURSE-joj" ] || ( echo "ERROR: init first!" 1>&2 && exit )
|
|
||||||
|
|
||||||
|
|
||||||
# genjson
|
|
||||||
|
|
||||||
rsync -a ./$HOME/ $LXCHOST:$HOME
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# simple local backup
|
|
||||||
#
|
|
||||||
backup() {
|
|
||||||
|
|
||||||
[ -d $HOME/.local/share/joj ] || mkdir -p $HOME/.local/share/joj
|
|
||||||
|
|
||||||
BCK="$HOME/.local/share/joj/$1-$(date +%y%m%d-%H%M%S)"
|
|
||||||
echo "WARNING: $1 already exits, backing it up to $BCK"
|
|
||||||
mv "$1" "$BCK"
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
[ -z "$1" ] && echo "Usage: $0 update|init" && exit 1
|
|
||||||
|
|
||||||
[ -d $HOME/.cache ] || mkdir $HOME/.cache
|
|
||||||
cd $HOME/.cache
|
|
||||||
$1
|
|
||||||
Loading…
Reference in New Issue
Block a user