Skip to content

Commit 280bc24

Browse files
boomzeroboomzero
committed
Merge branch 'master' of github.com:XMOJ-Script-dev/XMOJ-Script
2 parents 27863a7 + 462621a commit 280bc24

12 files changed

Lines changed: 411 additions & 43 deletions

‎.github/workflows/AutoLabelIssue.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v5
12+
uses: actions/checkout@v6
1313
with:
1414
fetch-depth: 0
1515
- name: Generate a token

‎.github/workflows/CodeQL.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
steps:
22-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2323
- uses: github/codeql-action/init@v3
2424
with:
2525
languages: "javascript"

‎.github/workflows/DependencyScan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ jobs:
99
dependency-review:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
- uses: actions/dependency-review-action@v4

‎.github/workflows/Prerelease.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
with:
2222
node-version: 16
2323
registry-url: https://registry.npmjs.org/
24-
- uses: actions/checkout@v5
24+
- uses: actions/checkout@v6
2525
with:
2626
fetch-depth: 0
27-
- name: Publish to npm
28-
run: npm publish --provenance
29-
env:
30-
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
27+
# - name: Publish to npm
28+
# run: npm publish --provenance
29+
# env:
30+
# NODE_AUTH_TOKEN: ${{secrets.npm_token}}
3131
- name: Get version
3232
env:
3333
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}

‎.github/workflows/Release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
node-version: 16
2222
registry-url: https://registry.npmjs.org/
23-
- uses: actions/checkout@v5
23+
- uses: actions/checkout@v6
2424
with:
2525
fetch-depth: 0
2626
- name: Get version

‎.github/workflows/UpdateToRelease.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ on:
1111
jobs:
1212
UpdateToRelease:
1313
runs-on: ubuntu-latest
14+
# 添加条件：如果是 bot 触发的则跳过，避免无限循环
15+
if: github.event.pull_request.user.login != 'github-actions[bot]'
1416
permissions:
1517
pull-requests: write
1618
contents: write
1719
steps:
18-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
1921
with:
2022
fetch-depth: 0
2123
- name: Update to release
@@ -25,7 +27,7 @@ jobs:
2527
gh pr comment ${{ github.event.pull_request.number }} --body "请向\`dev\`分支提交pull request, 本pull request将被自动关闭"
2628
gh pr close ${{ github.event.pull_request.number }}
2729
else
28-
node ./Update/UpdateToRelease.js ${{ secrets.GITHUB_TOKEN }} ${{ github.event.number }} "$PR_BODY"
30+
node ./Update/UpdateToRelease.js ${{ secrets.GITHUB_TOKEN }} ${{ github.event.pull_request.number }} "$PR_BODY"
2931
fi
3032
env:
3133
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/UpdateVersion.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@ jobs:
1414
pull-requests: write
1515
contents: write
1616
runs-on: ubuntu-latest
17+
if: github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'github-actions[bot]'
1718
steps:
1819
- name: Generate a token
1920
id: generate_token
2021
uses: actions/create-github-app-token@v2
2122
with:
2223
app-id: ${{ secrets.APP_ID }}
2324
private-key: ${{ secrets.APP_PRIVATE_KEY }}
24-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2526
- name: Update version
2627
env:
2728
PR_BODY: ${{ github.event.pull_request.body }}

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pull-requests: write
1616
checks: write
1717
steps:
18-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v6
1919
with:
2020
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
2121
fetch-depth: 0 # a full history is required for pull request analysis

‎.github/workflows/sync-to-extern-contrib.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Syncing branches
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v5
13+
uses: actions/checkout@v6
1414
- name: Set up Node
1515
uses: actions/setup-node@v4
1616
with:

‎Update.json‎

Lines changed: 267 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3021,6 +3021,273 @@
30213021
}
30223022
],
30233023
"Notes": "No release notes were provided for this release."
3024+
},
3025+
"2.2.1": {
3026+
"UpdateDate": 1756003502262,
3027+
"Prerelease": true,
3028+
"UpdateContents": [
3029+
{
3030+
"PR": 839,
3031+
"Description": "Fix formatting in feedback card text"
3032+
}
3033+
],
3034+
"Notes": "No release notes were provided for this release."
3035+
},
3036+
"2.2.2": {
3037+
"UpdateDate": 1757851046240,
3038+
"Prerelease": true,
3039+
"UpdateContents": [
3040+
{
3041+
"PR": 852,
3042+
"Description": "Fix the submit button on some pages"
3043+
}
3044+
],
3045+
"Notes": "No release notes were provided for this release."
3046+
},
3047+
"2.3.0": {
3048+
"UpdateDate": 1757851277491,
3049+
"Prerelease": false,
3050+
"UpdateContents": [
3051+
{
3052+
"PR": 839,
3053+
"Description": "Fix formatting in feedback card text"
3054+
},
3055+
{
3056+
"PR": 852,
3057+
"Description": "Fix the submit button on some pages"
3058+
}
3059+
],
3060+
"Notes": "随着 CI 更新, 相信以后的 release 都会有 release notes("
3061+
},
3062+
"2.3.1": {
3063+
"UpdateDate": 1758944205783,
3064+
"Prerelease": true,
3065+
"UpdateContents": [
3066+
{
3067+
"PR": 856,
3068+
"Description": "修复由于 PHPSESSID 启用了 httpOnly 导致的后台不可用"
3069+
}
3070+
],
3071+
"Notes": "本版本修复了由于 PHPSESSID 启用了 httpOnly 导致的后台不可用"
3072+
},
3073+
"2.4.0": {
3074+
"UpdateDate": 1758956527554,
3075+
"Prerelease": false,
3076+
"UpdateContents": [
3077+
{
3078+
"PR": 856,
3079+
"Description": "修复由于 PHPSESSID 启用了 httpOnly 导致的后台不可用"
3080+
}
3081+
],
3082+
"Notes": "请尽快升级至本版本！"
3083+
},
3084+
"2.4.1": {
3085+
"UpdateDate": 1759412851092,
3086+
"Prerelease": true,
3087+
"UpdateContents": [
3088+
{
3089+
"PR": 861,
3090+
"Description": "Update CSS selector"
3091+
}
3092+
],
3093+
"Notes": "No release notes were provided for this release."
3094+
},
3095+
"2.4.2": {
3096+
"UpdateDate": 1759413584731,
3097+
"Prerelease": true,
3098+
"UpdateContents": [
3099+
{
3100+
"PR": 863,
3101+
"Description": "修复“NaN年前“"
3102+
}
3103+
],
3104+
"Notes": "修复“NaN年前“"
3105+
},
3106+
"2.4.3": {
3107+
"UpdateDate": 1759414259108,
3108+
"Prerelease": true,
3109+
"UpdateContents": [
3110+
{
3111+
"PR": 865,
3112+
"Description": "删除获取数据功能"
3113+
}
3114+
],
3115+
"Notes": "因为它利用的bug被修复了"
3116+
},
3117+
"2.4.4": {
3118+
"UpdateDate": 1759417362937,
3119+
"Prerelease": true,
3120+
"UpdateContents": [
3121+
{
3122+
"PR": 866,
3123+
"Description": "比赛题目页面里左侧栏加入题目序号列表"
3124+
}
3125+
],
3126+
"Notes": "#860 ..."
3127+
},
3128+
"2.4.5": {
3129+
"UpdateDate": 1759487413226,
3130+
"Prerelease": true,
3131+
"UpdateContents": [
3132+
{
3133+
"PR": 869,
3134+
"Description": "Update CSS selector (again...)"
3135+
}
3136+
],
3137+
"Notes": "为什么这个破东西老是换位置"
3138+
},
3139+
"2.4.6": {
3140+
"UpdateDate": 1759548958578,
3141+
"Prerelease": true,
3142+
"UpdateContents": [
3143+
{
3144+
"PR": 871,
3145+
"Description": "Add tooltip for ProblemSwitcher"
3146+
}
3147+
],
3148+
"Notes": "现在, 你只需要将鼠标悬浮在比赛题目切换器上方, 即可查看题目名称"
3149+
},
3150+
"2.4.7": {
3151+
"UpdateDate": 1759549826774,
3152+
"Prerelease": true,
3153+
"UpdateContents": [
3154+
{
3155+
"PR": 872,
3156+
"Description": "修复获取数据"
3157+
}
3158+
],
3159+
"Notes": "funny"
3160+
},
3161+
"2.5.0": {
3162+
"UpdateDate": 1759568103629,
3163+
"Prerelease": false,
3164+
"UpdateContents": [
3165+
{
3166+
"PR": 861,
3167+
"Description": "Update CSS selector"
3168+
},
3169+
{
3170+
"PR": 863,
3171+
"Description": "修复“NaN年前“"
3172+
},
3173+
{
3174+
"PR": 865,
3175+
"Description": "删除获取数据功能"
3176+
},
3177+
{
3178+
"PR": 866,
3179+
"Description": "比赛题目页面里左侧栏加入题目序号列表"
3180+
},
3181+
{
3182+
"PR": 869,
3183+
"Description": "Update CSS selector (again...)"
3184+
},
3185+
{
3186+
"PR": 871,
3187+
"Description": "Add tooltip for ProblemSwitcher"
3188+
},
3189+
{
3190+
"PR": 872,
3191+
"Description": "修复获取数据"
3192+
}
3193+
],
3194+
"Notes": "XMOJ-Script 2.5.0 新增了比赛题目切换器，方便您在题目之间快速切换。此功能默认启用，您也可以在设置中禁用它。本版本还修复了一个导致时间显示为“NaN年前”的错误, 更新了一些 CSS selector，以适应 XMOJ 网站的最新变化."
3195+
},
3196+
"2.5.1": {
3197+
"UpdateDate": 1759830659949,
3198+
"Prerelease": true,
3199+
"UpdateContents": [
3200+
{
3201+
"PR": 876,
3202+
"Description": "refactor: simplify SubmitLink selection by querying all anchors and finding by text"
3203+
}
3204+
],
3205+
"Notes": "No release notes were provided for this release."
3206+
},
3207+
"2.5.2": {
3208+
"UpdateDate": 1759845614758,
3209+
"Prerelease": true,
3210+
"UpdateContents": [
3211+
{
3212+
"PR": 877,
3213+
"Description": "fix: problem PID 可能为 null"
3214+
}
3215+
],
3216+
"Notes": "No release notes were provided for this release."
3217+
},
3218+
"2.5.3": {
3219+
"UpdateDate": 1770358959413,
3220+
"Prerelease": true,
3221+
"UpdateContents": [
3222+
{
3223+
"PR": 888,
3224+
"Description": "Fix AC code export for 5-digit question IDs"
3225+
}
3226+
],
3227+
"Notes": "No release notes were provided for this release."
3228+
},
3229+
"2.6.0": {
3230+
"UpdateDate": 1770426020324,
3231+
"Prerelease": false,
3232+
"UpdateContents": [
3233+
{
3234+
"PR": 876,
3235+
"Description": "refactor: simplify SubmitLink selection by querying all anchors and finding by text"
3236+
},
3237+
{
3238+
"PR": 877,
3239+
"Description": "fix: problem PID 可能为 null"
3240+
},
3241+
{
3242+
"PR": 888,
3243+
"Description": "Fix AC code export for 5-digit question IDs"
3244+
}
3245+
],
3246+
"Notes": "No release notes were provided for this release."
3247+
},
3248+
"2.6.1": {
3249+
"UpdateDate": 1770426401298,
3250+
"Prerelease": true,
3251+
"UpdateContents": [
3252+
{
3253+
"PR": 892,
3254+
"Description": "Update to release 2.6.0"
3255+
}
3256+
],
3257+
"Notes": "No release notes were provided for this release."
3258+
},
3259+
"2.7.0": {
3260+
"UpdateDate": 1770426883598,
3261+
"Prerelease": false,
3262+
"UpdateContents": [
3263+
{
3264+
"PR": 892,
3265+
"Description": "Update to release 2.6.0"
3266+
}
3267+
],
3268+
"Notes": "No release notes were provided for this release."
3269+
},
3270+
"2.7.1": {
3271+
"UpdateDate": 1770426896026,
3272+
"Prerelease": true,
3273+
"UpdateContents": [
3274+
{
3275+
"PR": 895,
3276+
"Description": "Update to release 2.7.0"
3277+
}
3278+
],
3279+
"Notes": "No release notes were provided for this release."
3280+
},
3281+
"2.7.2": {
3282+
"UpdateDate": 1770429143486,
3283+
"Prerelease": true,
3284+
"UpdateContents": [
3285+
{
3286+
"PR": 896,
3287+
"Description": "Update to release 2.7.0"
3288+
}
3289+
],
3290+
"Notes": "No release notes were provided for this release."
30243291
}
30253292
}
30263293
}

0 commit comments

Comments
 (0)