Skip to content

Commit 521d2d2

Browse files
committed
Merge github.com:syzoj/judge-v3
2 parents 1a247ef + c6e0531 commit 521d2d2

File tree

3 files changed

+54
-5
lines changed

3 files changed

+54
-5
lines changed

.github/workflows/build.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Build and Push
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
build:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
target:
14+
- name: with rootfs
15+
image-name: menci/syzoj-judge
16+
dockerfile: Dockerfile
17+
- name: without rootfs
18+
image-name: menci/syzoj-judge-norootfs
19+
dockerfile: Dockerfile.NOROOTFS
20+
name: Build and Push (${{ matrix.target.name }})
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v2
25+
- name: Set up QEMU
26+
uses: docker/setup-buildx-action@v1
27+
- name: Login to DockerHub
28+
uses: docker/login-action@v1
29+
with:
30+
username: ${{ secrets.DOCKERHUB_USERNAME }}
31+
password: ${{ secrets.DOCKERHUB_TOKEN }}
32+
- name: Generate Tag List
33+
run: |
34+
echo "TAGS<<EOF" >> $GITHUB_ENV
35+
36+
HASH_SHORT="$(git rev-parse --short HEAD)"
37+
echo $IMAGE_NAME:$HASH_SHORT >> $GITHUB_ENV
38+
echo $IMAGE_NAME:latest >> $GITHUB_ENV
39+
40+
echo "EOF" >> $GITHUB_ENV
41+
env:
42+
IMAGE_NAME: ${{ matrix.target.image-name }}
43+
- name: Build and Push
44+
uses: docker/build-push-action@v2
45+
with:
46+
platforms: linux/amd64
47+
push: true
48+
tags: ${{ env.TAGS }}
49+
file: ${{ matrix.target.dockerfile }}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"command-line-args": "^4.0.7",
3535
"cors": "^2.8.4",
3636
"crypto-js": "^3.1.9-1",
37-
"decompress": "^4.2.0",
37+
"decompress": "^4.2.1",
3838
"express": "^4.15.4",
3939
"fs-extra": "^3.0.1",
4040
"get-folder-size": "^1.0.0",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -846,10 +846,10 @@ decompress-unzip@^4.0.1:
846846
pify "^2.3.0"
847847
yauzl "^2.4.2"
848848

849-
decompress@^4.2.0:
850-
version "4.2.0"
851-
resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.0.tgz#7aedd85427e5a92dacfe55674a7c505e96d01f9d"
852-
integrity sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=
849+
decompress@^4.2.1:
850+
version "4.2.1"
851+
resolved "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118"
852+
integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==
853853
dependencies:
854854
decompress-tar "^4.0.0"
855855
decompress-tarbz2 "^4.0.0"

0 commit comments

Comments
 (0)