Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zhblue/hustoj
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 22.06.21
Choose a base ref
...
head repository: zhblue/hustoj
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 1,760 changed files with 81,106 additions and 284,728 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/deb_build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Debian Package

on: [push, pull_request]

jobs:
debian:
name: Debian/Ubuntu
strategy:
fail-fast: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Build
run: |
bash build.sh
- name: Upload
uses: actions/upload-artifact@v4
with:
name: debian
path: ./*.deb
18 changes: 18 additions & 0 deletions .github/workflows/docker_build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: docker build and w3m visit test

on:
push:
branches:
- master
pull_request:
branches:
- master
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: docker build
run: docker build . -t hustoj-dev --build-arg APT_MIRROR="N"
18 changes: 0 additions & 18 deletions .github/workflows/docker_build_test.yaml

This file was deleted.

29 changes: 0 additions & 29 deletions .travis.yml

This file was deleted.

6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:22.04
FROM ubuntu:24.04

COPY trunk/install/sources.list.sh /opt/sources.list.sh
#COPY trunk/install/sources.list.sh /opt/sources.list.sh

ARG APT_MIRROR="Y"
ARG APT_CA="N"
@@ -25,6 +25,7 @@ RUN apt-get -y update && \
php-zip \
php-mbstring \
php-xml \
php-yaml \
make \
flex \
gcc \
@@ -38,5 +39,6 @@ RUN bash /opt/docker/setup.sh

# VOLUME [ "/volume", "/home/judge/backup", "/home/judge/data", "/home/judge/etc", "/home/judge/web", "/var/lib/mysql" ]
VOLUME [ "/volume" ]
EXPOSE 80

ENTRYPOINT [ "/bin/bash", "/opt/docker/entrypoint.sh" ]
Loading