Skip to content

Commit 559b832

Browse files
authored
update action
1 parent 5b3ae0d commit 559b832

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

.github/workflows/docker.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,14 @@ jobs:
5454
context: .
5555
tags: ${{ steps.meta.outputs.tags }}
5656
labels: ${{ steps.meta.outputs.labels }}
57-
build-args: BASE_IMAGE=ubuntu:noble
5857

5958
- name: Run Tests
6059
continue-on-error: true
61-
run: docker run -e CTEST_OUTPUT_ON_FAILURE=1 --rm ${{ steps.meta.outputs.tags }} sh -c "cmake --build \$HOME/sysu/build -t test"
60+
uses: addnab/docker-run-action@v3
61+
with:
62+
image: ${{ steps.meta.outputs.tags }}
63+
run: |
64+
CTEST_OUTPUT_ON_FAILURE=1 cmake --build $HOME/sysu/build -t test
6265
6366
# Login against a Docker registry except on PR
6467
# https://github.com/docker/login-action
@@ -79,5 +82,4 @@ jobs:
7982
context: .
8083
tags: ${{ steps.meta.outputs.tags }}
8184
labels: ${{ steps.meta.outputs.labels }}
82-
build-args: BASE_IMAGE=ubuntu:noble
8385
platforms: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/ppc64le,linux/s390x

Dockerfile

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# syntax=docker/dockerfile:1.4
22
ARG BASE_IMAGE=ubuntu:noble
33
FROM ${BASE_IMAGE}
4-
WORKDIR /opt/SYsU-lang
5-
COPY <<build_install.sh <<run.sh . /opt/SYsU-lang
4+
WORKDIR /root/SYsU-lang
5+
COPY <<build_install.sh <<run.sh . /root/SYsU-lang
66
#!/bin/sh
77
rm -rf \$2
88
cmake -G Ninja \\
@@ -19,16 +19,16 @@ cmake --build \$2/build -j
1919
cmake --build \$2/build -t install
2020
build_install.sh
2121
#!/bin/sh
22-
python3 -m tarfile -e /autograder/submission/*.tar.gz /opt/SYsU-lang/submission
23-
rm -rf /opt/SYsU-lang/generator
24-
cp -r /opt/SYsU-lang/submission/*-Source/generator /opt/SYsU-lang
25-
rm -rf /opt/SYsU-lang/optimizer
26-
cp -r /opt/SYsU-lang/submission/*-Source/optimizer /opt/SYsU-lang
27-
rm -rf /opt/SYsU-lang/submission
28-
/opt/SYsU-lang/build_install.sh /opt/SYsU-lang /opt/sysu
22+
python3 -m tarfile -e /autograder/submission/*.tar.gz /root/SYsU-lang/submission
23+
rm -rf /root/SYsU-lang/generator
24+
cp -r /root/SYsU-lang/submission/*-Source/generator /root/SYsU-lang
25+
rm -rf /root/SYsU-lang/rootimizer
26+
cp -r /root/SYsU-lang/submission/*-Source/rootimizer /root/SYsU-lang
27+
rm -rf /root/SYsU-lang/submission
28+
/root/SYsU-lang/build_install.sh /root/SYsU-lang /root/sysu
2929
sysu-compiler \\
3030
--unittest=benchmark_generator_and_optimizer_1 \\
31-
"/opt/SYsU-lang/**/*.sysu.c" >/autograder/results/results.json
31+
"/root/SYsU-lang/**/*.sysu.c" >/autograder/results/results.json
3232
run.sh
3333
RUN <<EOF
3434
apt-get update -y
@@ -40,12 +40,12 @@ apt-get autoremove -y
4040
apt-get clean -y
4141
rm -rf /var/lib/apt/lists/*
4242
mkdir -p /autograder/results
43-
mv /opt/SYsU-lang/run.sh /autograder/run
43+
mv /root/SYsU-lang/run.sh /autograder/run
4444
chmod +x /autograder/run
45-
chmod +x /opt/SYsU-lang/build_install.sh
46-
/opt/SYsU-lang/build_install.sh /opt/SYsU-lang /opt/sysu
45+
chmod +x /root/SYsU-lang/build_install.sh
46+
/root/SYsU-lang/build_install.sh /root/SYsU-lang /root/sysu
4747
EOF
48-
ENV PATH=/opt/sysu/bin:$PATH \
49-
CPATH=/opt/sysu/include:$CPATH \
50-
LIBRARY_PATH=/opt/sysu/lib:$LIBRARY_PATH \
51-
LD_LIBRARY_PATH=/opt/sysu/lib:$LD_LIBRARY_PATH
48+
ENV PATH=/root/sysu/bin:$PATH \
49+
CPATH=/root/sysu/include:$CPATH \
50+
LIBRARY_PATH=/root/sysu/lib:$LIBRARY_PATH \
51+
LD_LIBRARY_PATH=/root/sysu/lib:$LD_LIBRARY_PATH

0 commit comments

Comments
 (0)