From 9ee0447715e44a174d02c1e9e9b9ac92917a4111 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sun, 15 Sep 2024 22:27:06 -0400 Subject: [PATCH 01/40] ci: setup golang --- .gitea/workflows/build.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .gitea/workflows/build.yaml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml new file mode 100644 index 0000000..71a2d6a --- /dev/null +++ b/.gitea/workflows/build.yaml @@ -0,0 +1,21 @@ +--- +name: Build +on: [push] + +jobs: + build: + container: + image: focs.ji.sjtu.edu.cn:5000/gitea/runner-images:ubuntu-latest-slim + steps: + - name: Check out repository code + uses: https://gitea.com/BoYanZh/checkout@focs + - name: Sanity Check + run: | + whoami + pwd + - name: Setup Go 1.23.1 + uses: https://gitea.com/actions/setup-go@v5 + with: + go-version: 1.23.1 + - name: Display Go version + run: go version -- 2.30.2 From 6a4795561c201de8821bd3f228c532911b7d2d1d Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sun, 15 Sep 2024 22:28:08 -0400 Subject: [PATCH 02/40] fix: setup-go version --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 71a2d6a..69f7530 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -14,7 +14,7 @@ jobs: whoami pwd - name: Setup Go 1.23.1 - uses: https://gitea.com/actions/setup-go@v5 + uses: https://gitea.com/actions/setup-go@v3 with: go-version: 1.23.1 - name: Display Go version -- 2.30.2 From 8067f53fb7b059e5e05b4089b9099f339333af8a Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sun, 15 Sep 2024 22:30:09 -0400 Subject: [PATCH 03/40] fix: use ubuntu-latest image --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 69f7530..2bf5c91 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -5,7 +5,7 @@ on: [push] jobs: build: container: - image: focs.ji.sjtu.edu.cn:5000/gitea/runner-images:ubuntu-latest-slim + image: focs.ji.sjtu.edu.cn:5000/gitea/runner-images:ubuntu-latest steps: - name: Check out repository code uses: https://gitea.com/BoYanZh/checkout@focs -- 2.30.2 From 07ed197567dee592dbe7953808e71465ced26fe2 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sun, 15 Sep 2024 22:38:02 -0400 Subject: [PATCH 04/40] ci: build & test --- .gitea/workflows/{build.yaml => test.yaml} | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) rename .gitea/workflows/{build.yaml => test.yaml} (55%) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/test.yaml similarity index 55% rename from .gitea/workflows/build.yaml rename to .gitea/workflows/test.yaml index 2bf5c91..53d4f59 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/test.yaml @@ -1,21 +1,26 @@ --- -name: Build -on: [push] +name: checks +on: + - push + - pull_request jobs: build: - container: - image: focs.ji.sjtu.edu.cn:5000/gitea/runner-images:ubuntu-latest + runs-on: ubuntu-latest steps: - name: Check out repository code uses: https://gitea.com/BoYanZh/checkout@focs - - name: Sanity Check - run: | - whoami - pwd - name: Setup Go 1.23.1 uses: https://gitea.com/actions/setup-go@v3 with: go-version: 1.23.1 - name: Display Go version run: go version + - name: Prepare + run: go env -w GOPROXY=https://goproxy.cn,direct + - name: Build + run: make build + - name: Test + run: | + make prepare-test + make test -- 2.30.2 From 74b3adde3d9e52c277c1e8eaf7474463384bdb6a Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sun, 15 Sep 2024 22:42:23 -0400 Subject: [PATCH 05/40] ci: set image directly --- .gitea/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 53d4f59..7eb99ef 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -6,7 +6,8 @@ on: jobs: build: - runs-on: ubuntu-latest + container: + image: focs.ji.sjtu.edu.cn:5000/gitea/runner-images:ubuntu-latest steps: - name: Check out repository code uses: https://gitea.com/BoYanZh/checkout@focs -- 2.30.2 From 9d8c75bd8f3296fb1af1ac15ca50458a090e5bf6 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sun, 15 Sep 2024 22:49:48 -0400 Subject: [PATCH 06/40] feat: mount ssh keys --- .gitea/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 7eb99ef..10616c6 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -8,6 +8,8 @@ jobs: build: container: image: focs.ji.sjtu.edu.cn:5000/gitea/runner-images:ubuntu-latest + volumes: + - /home/ta/.ssh:/root/.ssh steps: - name: Check out repository code uses: https://gitea.com/BoYanZh/checkout@focs -- 2.30.2 From f3d9c68192a880948b12772eeed2585c18634dad Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sun, 15 Sep 2024 22:51:57 -0400 Subject: [PATCH 07/40] ci: chown .ssh --- .gitea/workflows/test.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 10616c6..feb2197 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -20,7 +20,9 @@ jobs: - name: Display Go version run: go version - name: Prepare - run: go env -w GOPROXY=https://goproxy.cn,direct + run: | + go env -w GOPROXY=https://goproxy.cn,direct + chown -R root:root .ssh - name: Build run: make build - name: Test -- 2.30.2 From f16ae18c26f5532c9a2514b97d4e6d8caea16ed4 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sun, 15 Sep 2024 22:54:28 -0400 Subject: [PATCH 08/40] ci: sanity check --- .gitea/workflows/test.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index feb2197..b5cbf8d 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -17,12 +17,16 @@ jobs: uses: https://gitea.com/actions/setup-go@v3 with: go-version: 1.23.1 + - name: Sanity Check + run: | + ls -lha + whoami - name: Display Go version run: go version - name: Prepare run: | go env -w GOPROXY=https://goproxy.cn,direct - chown -R root:root .ssh + chown -R root:root /root/.ssh - name: Build run: make build - name: Test -- 2.30.2 From d2d34b30f2c5ac9706d8feeaab9c14ed3abb731f Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sun, 15 Sep 2024 22:59:39 -0400 Subject: [PATCH 09/40] ci: go-judge --- .gitea/workflows/test.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index b5cbf8d..9172b45 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -21,6 +21,14 @@ jobs: run: | ls -lha whoami + - name: Install & Run go-judge + run: | + cd /tmp + wget https://ghp.ci/https://github.com/criyle/go-judge/releases/download/v1.8.5/go-judge_1.8.5_linux_amd64.deb + dpkg -i go-judge_1.8.5_linux_amd64.deb + rm go-judge_1.8.5_linux_amd64.deb + go-judge -grpc-addr 0.0.0.0:5051 -enable-grpc -enable-debug -enable-metrics & + cd - - name: Display Go version run: go version - name: Prepare -- 2.30.2 From cf9a4ff1aa0e48355657fdffa9b2431be61e5f0c Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Mon, 16 Sep 2024 00:41:21 -0400 Subject: [PATCH 10/40] ci: ci-test --- .gitea/workflows/test.yaml | 2 +- Makefile | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 9172b45..6035cc3 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -40,4 +40,4 @@ jobs: - name: Test run: | make prepare-test - make test + make ci-test diff --git a/Makefile b/Makefile index cea7f45..bb3bc16 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all build clean prepare-test test +.PHONY: all build clean prepare-test test ci-test BUILD_DIR = ./build TMP_DIR = ./tmp @@ -21,3 +21,8 @@ prepare-test: test: ./scripts/prepare_test_repos.sh $(TMP_DIR) go test -coverprofile cover.out -v ./... + +ci-test: + ./scripts/prepare_test_repos.sh $(TMP_DIR) + ./scripts/run_foreach_test_repos.sh $(TMP_DIR) "sed -i '1i sandboxExecServer = \"172.17.0.1:5051\"' conf.toml" + go test -coverprofile cover.out -v ./... -- 2.30.2 From 1427eb265562d5552240f458c4bec4f53f3f9e71 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Mon, 16 Sep 2024 00:42:01 -0400 Subject: [PATCH 11/40] ci: remove install go-judge --- .gitea/workflows/test.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 6035cc3..5a6e29c 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -21,14 +21,6 @@ jobs: run: | ls -lha whoami - - name: Install & Run go-judge - run: | - cd /tmp - wget https://ghp.ci/https://github.com/criyle/go-judge/releases/download/v1.8.5/go-judge_1.8.5_linux_amd64.deb - dpkg -i go-judge_1.8.5_linux_amd64.deb - rm go-judge_1.8.5_linux_amd64.deb - go-judge -grpc-addr 0.0.0.0:5051 -enable-grpc -enable-debug -enable-metrics & - cd - - name: Display Go version run: go version - name: Prepare -- 2.30.2 From ac9d3f17eaac09c20ac82ac7c0fa1a12b1e7f740 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:00:24 -0400 Subject: [PATCH 12/40] feat: use CN mirror --- .gitea/workflows/test.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 5a6e29c..5fb53f8 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -14,9 +14,10 @@ jobs: - name: Check out repository code uses: https://gitea.com/BoYanZh/checkout@focs - name: Setup Go 1.23.1 - uses: https://gitea.com/actions/setup-go@v3 - with: - go-version: 1.23.1 + run: | + wget https://studygolang.com/dl/golang/go1.23.1.linux-amd64.tar.gz + rm -rf /usr/local/go && tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz + rm -rf go1.23.1.linux-amd64.tar.gz - name: Sanity Check run: | ls -lha -- 2.30.2 From 70409540564c06d007b0926d84f92fe3fc549ab9 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:01:44 -0400 Subject: [PATCH 13/40] ci: sanity check --- .gitea/workflows/test.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 5fb53f8..1f7bc36 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -15,13 +15,16 @@ jobs: uses: https://gitea.com/BoYanZh/checkout@focs - name: Setup Go 1.23.1 run: | - wget https://studygolang.com/dl/golang/go1.23.1.linux-amd64.tar.gz - rm -rf /usr/local/go && tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz + wget -q https://studygolang.com/dl/golang/go1.23.1.linux-amd64.tar.gz + rm -rf /usr/local/go + tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz rm -rf go1.23.1.linux-amd64.tar.gz - name: Sanity Check run: | ls -lha + ls -lha /usr/local whoami + echo $PATH - name: Display Go version run: go version - name: Prepare -- 2.30.2 From 6795de2663a719916c0a6fc4faf76784b325932e Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:04:07 -0400 Subject: [PATCH 14/40] ci: set PATH --- .gitea/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 1f7bc36..3f0ad75 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -19,6 +19,7 @@ jobs: rm -rf /usr/local/go tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz rm -rf go1.23.1.linux-amd64.tar.gz + export PATH=$PATH:/usr/local/go/bin - name: Sanity Check run: | ls -lha -- 2.30.2 From 445a48633b4a7a5ab31743224d7edd9c4ddf1e06 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:05:34 -0400 Subject: [PATCH 15/40] ci: set PATH --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 3f0ad75..f75661f 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -19,7 +19,7 @@ jobs: rm -rf /usr/local/go tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz rm -rf go1.23.1.linux-amd64.tar.gz - export PATH=$PATH:/usr/local/go/bin + echo "PATH=$PATH:/usr/local/go/bin" >> $GITHUB_ENV - name: Sanity Check run: | ls -lha -- 2.30.2 From 179b420fbcd49c72e21df6a63e609f6daed92672 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:10:06 -0400 Subject: [PATCH 16/40] ci: fix .ssh mount --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index f75661f..d04b514 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -9,7 +9,7 @@ jobs: container: image: focs.ji.sjtu.edu.cn:5000/gitea/runner-images:ubuntu-latest volumes: - - /home/ta/.ssh:/root/.ssh + - /home/actions/.ssh:/root/.ssh steps: - name: Check out repository code uses: https://gitea.com/BoYanZh/checkout@focs -- 2.30.2 From 4ee63c621f2f3b704c3a02e4d613f5e47b1bc71a Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:14:29 -0400 Subject: [PATCH 17/40] ci: fix go env --- .gitea/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index d04b514..7d64f3c 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -30,6 +30,7 @@ jobs: run: go version - name: Prepare run: | + go env -w GO111MODULE=on go env -w GOPROXY=https://goproxy.cn,direct chown -R root:root /root/.ssh - name: Build -- 2.30.2 From aad3fee1fc78be26bb4c5ba41b9bba45856a3427 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:16:46 -0400 Subject: [PATCH 18/40] ci: check .ssh --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 7d64f3c..639242e 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -23,7 +23,7 @@ jobs: - name: Sanity Check run: | ls -lha - ls -lha /usr/local + ls -lha ~/.ssh whoami echo $PATH - name: Display Go version -- 2.30.2 From ca5d94fad266b5595454649cdcbde337d1408fc3 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:23:26 -0400 Subject: [PATCH 19/40] ci: test clone --- .gitea/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 639242e..e47dbad 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -33,6 +33,8 @@ jobs: go env -w GO111MODULE=on go env -w GOPROXY=https://goproxy.cn,direct chown -R root:root /root/.ssh + cd ~ + git clone ssh://git@focs.ji.sjtu.edu.cn:2222/FOCS-dev/JOJ3-examples.git - name: Build run: make build - name: Test -- 2.30.2 From 5b2ed401755abad429ecf5baa3a04168be3b49ce Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:24:38 -0400 Subject: [PATCH 20/40] ci: test clone --- .gitea/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index e47dbad..cfff4c4 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -34,6 +34,8 @@ jobs: go env -w GOPROXY=https://goproxy.cn,direct chown -R root:root /root/.ssh cd ~ + ls -lha ~/.ssh + cat ~/.ssh/id_ed25519.pub git clone ssh://git@focs.ji.sjtu.edu.cn:2222/FOCS-dev/JOJ3-examples.git - name: Build run: make build -- 2.30.2 From cb586589a1c32ac2514da2532eea6e1a77a1bead Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:27:27 -0400 Subject: [PATCH 21/40] ci: test clone --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index cfff4c4..584f36f 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -36,7 +36,7 @@ jobs: cd ~ ls -lha ~/.ssh cat ~/.ssh/id_ed25519.pub - git clone ssh://git@focs.ji.sjtu.edu.cn:2222/FOCS-dev/JOJ3-examples.git + GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no" git clone ssh://git@focs.ji.sjtu.edu.cn:2222/FOCS-dev/JOJ3-examples.git - name: Build run: make build - name: Test -- 2.30.2 From f2b3a3a0eec4e79c9d6eac50e63fefce7422da1c Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:29:29 -0400 Subject: [PATCH 22/40] ci: test clone --- .gitea/workflows/test.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 584f36f..639242e 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -33,10 +33,6 @@ jobs: go env -w GO111MODULE=on go env -w GOPROXY=https://goproxy.cn,direct chown -R root:root /root/.ssh - cd ~ - ls -lha ~/.ssh - cat ~/.ssh/id_ed25519.pub - GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no" git clone ssh://git@focs.ji.sjtu.edu.cn:2222/FOCS-dev/JOJ3-examples.git - name: Build run: make build - name: Test -- 2.30.2 From 5977b39fe3f342f5528e2c5324b5293305f3650b Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:33:19 -0400 Subject: [PATCH 23/40] ci: fix conf.json --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bb3bc16..61e9d4a 100644 --- a/Makefile +++ b/Makefile @@ -24,5 +24,5 @@ test: ci-test: ./scripts/prepare_test_repos.sh $(TMP_DIR) - ./scripts/run_foreach_test_repos.sh $(TMP_DIR) "sed -i '1i sandboxExecServer = \"172.17.0.1:5051\"' conf.toml" + ./scripts/run_foreach_test_repos.sh $(TMP_DIR) "sed -i '2i \ \ \"sandboxExecServer\": \"172.17.0.1:5051\",' conf.json" go test -coverprofile cover.out -v ./... -- 2.30.2 From ce92afe0375e7707c2e9ed777031cd88695a1bb8 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:36:11 -0400 Subject: [PATCH 24/40] ci: change GOPROXY --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 639242e..1a1c05a 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -31,7 +31,7 @@ jobs: - name: Prepare run: | go env -w GO111MODULE=on - go env -w GOPROXY=https://goproxy.cn,direct + go env -w GOPROXY=https://gocenter.io,direct chown -R root:root /root/.ssh - name: Build run: make build -- 2.30.2 From d33336e98d67859b09d2051354908a13d4c1bbba Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:39:01 -0400 Subject: [PATCH 25/40] ci: change GOPROXY --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 1a1c05a..618c858 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -31,7 +31,7 @@ jobs: - name: Prepare run: | go env -w GO111MODULE=on - go env -w GOPROXY=https://gocenter.io,direct + go env -w GOPROXY=https://goproxy.io,direct chown -R root:root /root/.ssh - name: Build run: make build -- 2.30.2 From 9f2a26dc1e2311943d78dd6a184c219d55f86276 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:43:44 -0400 Subject: [PATCH 26/40] ci: remove drone --- .drone.yml | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 9f009f4..0000000 --- a/.drone.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -kind: pipeline -type: ssh -name: CI -server: - host: 111.186.59.59 - user: drone - ssh_key: - from_secret: joj3-test - -steps: - - name: prepare - commands: - - go env -w GOPROXY=https://goproxy.cn,direct - - whoami - - pwd - - env - - go version - - go env - - git status -v - - git log -1 - - name: build - commands: - - make - - name: test - commands: - - make prepare-test - - make test - - name: store - commands: - - cp build/joj3 /home/drone/.local/bin/joj3 -- 2.30.2 From 60e0c788aa1224da33f3bd67af971b85621ba6e2 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:46:51 -0400 Subject: [PATCH 27/40] ci: setup cache --- .gitea/workflows/test.yaml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 618c858..65952ca 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -20,14 +20,22 @@ jobs: tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz rm -rf go1.23.1.linux-amd64.tar.gz echo "PATH=$PATH:/usr/local/go/bin" >> $GITHUB_ENV - - name: Sanity Check - run: | - ls -lha - ls -lha ~/.ssh - whoami - echo $PATH - name: Display Go version run: go version + - id: go-cache-paths + run: | + echo "::set-output name=go-build::$(go env GOCACHE)" + echo "::set-output name=go-mod::$(go env GOMODCACHE)" + - name: Go Build Cache + uses: https://gitea.com/actions/cache@v2 + with: + path: ${{ steps.go-cache-paths.outputs.go-build }} + key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }} + - name: Go Mod Cache + uses: https://gitea.com/actions/cache@v2 + with: + path: ${{ steps.go-cache-paths.outputs.go-mod }} + key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }} - name: Prepare run: | go env -w GO111MODULE=on -- 2.30.2 From 0a4045761ceafd63c4feebeb18786b30f8ccbbdb Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:49:30 -0400 Subject: [PATCH 28/40] ci: test cache --- .gitea/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 65952ca..8e4e8b3 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -22,7 +22,8 @@ jobs: echo "PATH=$PATH:/usr/local/go/bin" >> $GITHUB_ENV - name: Display Go version run: go version - - id: go-cache-paths + - name: Setup Go Cache + id: go-cache-paths run: | echo "::set-output name=go-build::$(go env GOCACHE)" echo "::set-output name=go-mod::$(go env GOMODCACHE)" -- 2.30.2 From ecea98e912f4ae980c020384034b845ebcdf12b6 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:55:53 -0400 Subject: [PATCH 29/40] ci: test cache --- .gitea/workflows/test.yaml | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 8e4e8b3..419ed5d 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -22,21 +22,27 @@ jobs: echo "PATH=$PATH:/usr/local/go/bin" >> $GITHUB_ENV - name: Display Go version run: go version - - name: Setup Go Cache - id: go-cache-paths - run: | - echo "::set-output name=go-build::$(go env GOCACHE)" - echo "::set-output name=go-mod::$(go env GOMODCACHE)" - - name: Go Build Cache - uses: https://gitea.com/actions/cache@v2 + - name: Get go-hashfiles + uses: https://gitea.com/actions/go-hashfiles@v0.0.1 + id: hash-go with: - path: ${{ steps.go-cache-paths.outputs.go-build }} - key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }} - - name: Go Mod Cache - uses: https://gitea.com/actions/cache@v2 - with: - path: ${{ steps.go-cache-paths.outputs.go-mod }} - key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }} + patterns: |- + go.mod + go.sum + + - name: Echo hash + run: echo ${{ steps.hash-go.outputs.hash }} + + - name: Cache go + id: cache-go + uses: https://gitea.com/actions/cache@v3 # Action cache + with: # specify with your GOMODCACHE and GOCACHE + path: |- + /root/go/pkg/mod + /root/.cache/go-build + key: go_cache-${{ steps.hash-go.outputs.hash }} + restore-keys: |- + go_cache-${{ steps.hash-go.outputs.hash }} - name: Prepare run: | go env -w GO111MODULE=on -- 2.30.2 From 988a5200f94cce684431046e11de75f6f6a3f484 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 18:58:05 -0400 Subject: [PATCH 30/40] ci: test cache --- .gitea/workflows/test.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 419ed5d..e11666f 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -22,6 +22,11 @@ jobs: echo "PATH=$PATH:/usr/local/go/bin" >> $GITHUB_ENV - name: Display Go version run: go version + - name: Prepare + run: | + go env -w GO111MODULE=on + go env -w GOPROXY=https://goproxy.io,direct + chown -R root:root /root/.ssh - name: Get go-hashfiles uses: https://gitea.com/actions/go-hashfiles@v0.0.1 id: hash-go @@ -29,10 +34,8 @@ jobs: patterns: |- go.mod go.sum - - name: Echo hash run: echo ${{ steps.hash-go.outputs.hash }} - - name: Cache go id: cache-go uses: https://gitea.com/actions/cache@v3 # Action cache @@ -43,11 +46,6 @@ jobs: key: go_cache-${{ steps.hash-go.outputs.hash }} restore-keys: |- go_cache-${{ steps.hash-go.outputs.hash }} - - name: Prepare - run: | - go env -w GO111MODULE=on - go env -w GOPROXY=https://goproxy.io,direct - chown -R root:root /root/.ssh - name: Build run: make build - name: Test -- 2.30.2 From d209c48531a3597726967f009c75a613ddca1da9 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 19:05:58 -0400 Subject: [PATCH 31/40] ci: test cache --- .gitea/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index e11666f..979a988 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -38,8 +38,8 @@ jobs: run: echo ${{ steps.hash-go.outputs.hash }} - name: Cache go id: cache-go - uses: https://gitea.com/actions/cache@v3 # Action cache - with: # specify with your GOMODCACHE and GOCACHE + uses: https://gitea.com/actions/cache@v3 + with: path: |- /root/go/pkg/mod /root/.cache/go-build -- 2.30.2 From 075e92fe49eb065caed57ec98944c430488e3e1a Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 19:12:08 -0400 Subject: [PATCH 32/40] ci: remove cache --- .gitea/workflows/test.yaml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 979a988..315917f 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -27,25 +27,6 @@ jobs: go env -w GO111MODULE=on go env -w GOPROXY=https://goproxy.io,direct chown -R root:root /root/.ssh - - name: Get go-hashfiles - uses: https://gitea.com/actions/go-hashfiles@v0.0.1 - id: hash-go - with: - patterns: |- - go.mod - go.sum - - name: Echo hash - run: echo ${{ steps.hash-go.outputs.hash }} - - name: Cache go - id: cache-go - uses: https://gitea.com/actions/cache@v3 - with: - path: |- - /root/go/pkg/mod - /root/.cache/go-build - key: go_cache-${{ steps.hash-go.outputs.hash }} - restore-keys: |- - go_cache-${{ steps.hash-go.outputs.hash }} - name: Build run: make build - name: Test -- 2.30.2 From 4640411b933a3d48ab6cc8daed97ce565f4b7f1a Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Thu, 19 Sep 2024 19:15:56 -0400 Subject: [PATCH 33/40] ci: lint --- .gitea/workflows/test.yaml | 5 +++++ Makefile | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 315917f..c894a1d 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -27,6 +27,11 @@ jobs: go env -w GO111MODULE=on go env -w GOPROXY=https://goproxy.io,direct chown -R root:root /root/.ssh + - name: Setup golangci-lint + run: | + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.61.0 + - name: Lint + run: make lint - name: Build run: make build - name: Test diff --git a/Makefile b/Makefile index 61e9d4a..f54d3c0 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all build clean prepare-test test ci-test +.PHONY: all build clean lint prepare-test test ci-test BUILD_DIR = ./build TMP_DIR = ./tmp @@ -15,6 +15,9 @@ clean: rm -rf $(TMP_DIR)/* rm -rf *.out +lint: + golangci-lint run + prepare-test: git submodule update --init --remote -- 2.30.2 From b0a31331389da5fb49c7db3e7e821214d002cabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B3=8A=E6=98=8E518370910136?= Date: Fri, 20 Sep 2024 07:30:20 +0800 Subject: [PATCH 34/40] ci: lint --- .gitea/workflows/test.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index c894a1d..71dadfc 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -19,7 +19,7 @@ jobs: rm -rf /usr/local/go tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz rm -rf go1.23.1.linux-amd64.tar.gz - echo "PATH=$PATH:/usr/local/go/bin" >> $GITHUB_ENV + echo "PATH=$PATH:/usr/local/go/bin:$(go env GOPATH)/bin" >> $GITHUB_ENV - name: Display Go version run: go version - name: Prepare @@ -29,7 +29,10 @@ jobs: chown -R root:root /root/.ssh - name: Setup golangci-lint run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.61.0 + wget -q https://ghp.ci/https://github.com/golangci/golangci-lint/releases/download/v1.61.0/golangci-lint-1.61.0-linux-amd64.tar.gz + tar -C /tmp -xzf golangci-lint-1.61.0-linux-amd64.tar.gz + rm -rf golangci-lint-1.61.0-linux-amd64.tar.gz + mv /tmp/golangci-lint-1.61.0-linux-amd64/golangci-lint $(go env GOPATH)/bin - name: Lint run: make lint - name: Build -- 2.30.2 From 20ddf62a96951a60a01533ec992accf972fa77df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B3=8A=E6=98=8E518370910136?= Date: Fri, 20 Sep 2024 07:44:24 +0800 Subject: [PATCH 35/40] ci: lint --- .gitea/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 71dadfc..a09e44f 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -32,6 +32,7 @@ jobs: wget -q https://ghp.ci/https://github.com/golangci/golangci-lint/releases/download/v1.61.0/golangci-lint-1.61.0-linux-amd64.tar.gz tar -C /tmp -xzf golangci-lint-1.61.0-linux-amd64.tar.gz rm -rf golangci-lint-1.61.0-linux-amd64.tar.gz + mkdir -p $(go env GOPATH)/bin mv /tmp/golangci-lint-1.61.0-linux-amd64/golangci-lint $(go env GOPATH)/bin - name: Lint run: make lint -- 2.30.2 From 3d516a9eba46e7fa0fde9f7d9935d219b168c923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B3=8A=E6=98=8E518370910136?= Date: Fri, 20 Sep 2024 07:46:13 +0800 Subject: [PATCH 36/40] ci: lint --- .gitea/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index a09e44f..424ac69 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -19,7 +19,8 @@ jobs: rm -rf /usr/local/go tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz rm -rf go1.23.1.linux-amd64.tar.gz - echo "PATH=$PATH:/usr/local/go/bin:$(go env GOPATH)/bin" >> $GITHUB_ENV + echo "PATH=$PATH:/usr/local/go/bin" >> $GITHUB_ENV + echo "PATH=$PATH:$(go env GOPATH)/bin" >> $GITHUB_ENV - name: Display Go version run: go version - name: Prepare -- 2.30.2 From 07965111371e00bb705fee29dfa6ee027b3c7044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B3=8A=E6=98=8E518370910136?= Date: Fri, 20 Sep 2024 07:47:48 +0800 Subject: [PATCH 37/40] ci: lint --- .gitea/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 424ac69..1dcf603 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -20,6 +20,7 @@ jobs: tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz rm -rf go1.23.1.linux-amd64.tar.gz echo "PATH=$PATH:/usr/local/go/bin" >> $GITHUB_ENV + go env GOPATH echo "PATH=$PATH:$(go env GOPATH)/bin" >> $GITHUB_ENV - name: Display Go version run: go version -- 2.30.2 From e5f8806ce852b29d458fa9bbd0bc7e696755af72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B3=8A=E6=98=8E518370910136?= Date: Fri, 20 Sep 2024 07:48:47 +0800 Subject: [PATCH 38/40] ci: lint --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 1dcf603..cc9a1fe 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -21,7 +21,7 @@ jobs: rm -rf go1.23.1.linux-amd64.tar.gz echo "PATH=$PATH:/usr/local/go/bin" >> $GITHUB_ENV go env GOPATH - echo "PATH=$PATH:$(go env GOPATH)/bin" >> $GITHUB_ENV + # echo "PATH=$PATH:$(go env GOPATH)/bin" >> $GITHUB_ENV - name: Display Go version run: go version - name: Prepare -- 2.30.2 From c95e3e0f5e1b6edb9adc213470af603ef393fae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B3=8A=E6=98=8E518370910136?= Date: Fri, 20 Sep 2024 07:51:26 +0800 Subject: [PATCH 39/40] Update .gitea/workflows/test.yaml --- .gitea/workflows/test.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index cc9a1fe..a7a5081 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -19,9 +19,7 @@ jobs: rm -rf /usr/local/go tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz rm -rf go1.23.1.linux-amd64.tar.gz - echo "PATH=$PATH:/usr/local/go/bin" >> $GITHUB_ENV - go env GOPATH - # echo "PATH=$PATH:$(go env GOPATH)/bin" >> $GITHUB_ENV + echo "PATH=$PATH:/usr/local/go/bin:/root/go/bin" >> $GITHUB_ENV - name: Display Go version run: go version - name: Prepare @@ -34,8 +32,8 @@ jobs: wget -q https://ghp.ci/https://github.com/golangci/golangci-lint/releases/download/v1.61.0/golangci-lint-1.61.0-linux-amd64.tar.gz tar -C /tmp -xzf golangci-lint-1.61.0-linux-amd64.tar.gz rm -rf golangci-lint-1.61.0-linux-amd64.tar.gz - mkdir -p $(go env GOPATH)/bin - mv /tmp/golangci-lint-1.61.0-linux-amd64/golangci-lint $(go env GOPATH)/bin + mkdir -p /root/go/bin + mv /tmp/golangci-lint-1.61.0-linux-amd64/golangci-lint /root/go/bin - name: Lint run: make lint - name: Build -- 2.30.2 From 45842a2037f3cc5bd603bf9333bbef764efd0287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B3=8A=E6=98=8E518370910136?= Date: Fri, 20 Sep 2024 07:58:56 +0800 Subject: [PATCH 40/40] fix: gosec warning --- internal/stage/model.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/internal/stage/model.go b/internal/stage/model.go index cb33462..dba945a 100644 --- a/internal/stage/model.go +++ b/internal/stage/model.go @@ -3,7 +3,6 @@ package stage import ( "fmt" "strconv" - "time" "github.com/criyle/go-judge/envexec" ) @@ -126,8 +125,8 @@ func (r ExecutorResult) String() string { Status Status ExitStatus int Error string - Time time.Duration - RunTime time.Duration + Time uint64 + RunTime uint64 Memory envexec.Size Files map[string]string FileIDs map[string]string @@ -137,8 +136,8 @@ func (r ExecutorResult) String() string { Status: r.Status, ExitStatus: r.ExitStatus, Error: r.Error, - Time: time.Duration(r.Time), - RunTime: time.Duration(r.RunTime), + Time: r.Time, + RunTime: r.RunTime, Memory: envexec.Size(r.Memory), Files: make(map[string]string), FileIDs: r.FileIDs, -- 2.30.2