diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a295c4f4..60b5745a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: node-version: 14.x - name: Config run: | - [[ ! -z $(${{secrets.NPM_TOKEN}}) ]] && echo "npmAuthToken: ${{secrets.NPM_TOKEN}}" >> .yarnrc.yml + [[ ! -z "${{secrets.NPM_TOKEN}}" ]] && echo "npmAuthToken: ${{secrets.NPM_TOKEN}}" >> .yarnrc.yml git config --global user.name undefined git config --global user.email i@undefined.moe - name: Install diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 8bb76121..32b543a7 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.28.9", + "version": "2.28.10", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", @@ -12,7 +12,7 @@ }, "preferUnplugged": true, "dependencies": { - "@hydrooj/utils": "^1.0.17", + "@hydrooj/utils": "^1.0.19", "adm-zip": "^0.5.5", "ansi_up": "^5.0.1", "cac": "^6.7.3", diff --git a/packages/hydrooj/src/interface.ts b/packages/hydrooj/src/interface.ts index 2500a859..e37288b5 100644 --- a/packages/hydrooj/src/interface.ts +++ b/packages/hydrooj/src/interface.ts @@ -126,6 +126,7 @@ export enum ProblemType { Default = 'default', SubmitAnswer = 'submit_answer', Interactive = 'interactive', + Subjective = 'subjective', } export enum SubtaskType { diff --git a/packages/utils/lib/cases.ts b/packages/utils/lib/cases.ts index 483087eb..51924033 100644 --- a/packages/utils/lib/cases.ts +++ b/packages/utils/lib/cases.ts @@ -31,7 +31,7 @@ export default async function readYamlCases(cfg: Record = {}, check } else throw new Error('Invalid user_extra_files config.'); } if (cfg.outputs) { - config.type = 'submit_answer'; + config.type = 'subjective'; } else if (cfg.cases?.length) { config.subtasks = [{ score: +cfg.score || Math.floor(100 / cfg.cases.length), diff --git a/packages/utils/package.json b/packages/utils/package.json index 8b089665..d413ae9e 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/utils", - "version": "1.0.18", + "version": "1.0.19", "description": "hydrooj utils", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro.git",