mirror of
https://gitcode.com/gh_mirrors/hy/Hydro.git
synced 2026-10-17 09:36:08 +08:00
ci: fix
This commit is contained in:
1 parent
f4dca478be
commit
44de90bcab
3 files changed
+54
-54
No files matched your search
+52
-52
@@ -46,55 +46,55 @@ jobs:
|
||||
- name: Publish
|
||||
if: ${{ github.event_name == 'push' }}
|
||||
run: node build/publish.js
|
||||
web:
|
||||
needs: build
|
||||
permissions:
|
||||
packages: write
|
||||
contents: read
|
||||
runs-on: ubuntu-latest
|
||||
if: ${{ github.event_name == 'push' }}
|
||||
steps:
|
||||
- name: Check out
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: Log in to GitHub Docker Registry
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
registry: docker.pkg.github.com
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Docker:Web
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
push: true
|
||||
context: ./install/docker/backend
|
||||
tags: |
|
||||
docker.pkg.github.com/hydro-dev/web:${{ github.sha }}
|
||||
docker.pkg.github.com/hydro-dev/web:${{ github.ref }}
|
||||
judge:
|
||||
needs: build
|
||||
if: ${{ github.event_name == 'push' }}
|
||||
permissions:
|
||||
packages: write
|
||||
contents: read
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check out
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: Log in to GitHub Docker Registry
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
registry: docker.pkg.github.com
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Docker:Judge
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
push: true
|
||||
context: ./install/docker/judge
|
||||
tags: |
|
||||
docker.pkg.github.com/hydro-dev/judge:${{ github.sha }}
|
||||
docker.pkg.github.com/hydro-dev/judge:${{ github.ref }}
|
||||
# web:
|
||||
# needs: build
|
||||
# permissions:
|
||||
# packages: write
|
||||
# contents: read
|
||||
# runs-on: ubuntu-latest
|
||||
# if: ${{ github.event_name == 'push' }}
|
||||
# steps:
|
||||
# - name: Check out
|
||||
# uses: actions/checkout@v2
|
||||
# with:
|
||||
# submodules: recursive
|
||||
# - name: Log in to GitHub Docker Registry
|
||||
# uses: docker/login-action@v1
|
||||
# with:
|
||||
# registry: docker.pkg.github.com
|
||||
# username: ${{ github.actor }}
|
||||
# password: ${{ secrets.GITHUB_TOKEN }}
|
||||
# - name: Docker:Web
|
||||
# uses: docker/build-push-action@v2
|
||||
# with:
|
||||
# push: true
|
||||
# context: ./install/docker/backend
|
||||
# tags: |
|
||||
# docker.pkg.github.com/hydro-dev/web:${{ github.sha }}
|
||||
# docker.pkg.github.com/hydro-dev/web:${{ github.ref }}
|
||||
# judge:
|
||||
# needs: build
|
||||
# if: ${{ github.event_name == 'push' }}
|
||||
# permissions:
|
||||
# packages: write
|
||||
# contents: read
|
||||
# runs-on: ubuntu-latest
|
||||
# steps:
|
||||
# - name: Check out
|
||||
# uses: actions/checkout@v2
|
||||
# with:
|
||||
# submodules: recursive
|
||||
# - name: Log in to GitHub Docker Registry
|
||||
# uses: docker/login-action@v1
|
||||
# with:
|
||||
# registry: docker.pkg.github.com
|
||||
# username: ${{ github.actor }}
|
||||
# password: ${{ secrets.GITHUB_TOKEN }}
|
||||
# - name: Docker:Judge
|
||||
# uses: docker/build-push-action@v2
|
||||
# with:
|
||||
# push: true
|
||||
# context: ./install/docker/judge
|
||||
# tags: |
|
||||
# docker.pkg.github.com/hydro-dev/judge:${{ github.sha }}
|
||||
# docker.pkg.github.com/hydro-dev/judge:${{ github.ref }}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "hydrooj",
|
||||
"version": "2.29.35",
|
||||
"version": "2.29.36",
|
||||
"bin": "bin/hydrooj.js",
|
||||
"main": "dist/loader.js",
|
||||
"typings": "dist/loader.d.ts",
|
||||
|
||||
@@ -361,7 +361,7 @@ export class HandlerCommon {
|
||||
!this.request.host
|
||||
|| (this.domain?.host instanceof Array
|
||||
? (!this.domain.host.includes(this.request.host))
|
||||
: this.domain.host !== this.domain?.host)
|
||||
: this.request.host !== this.domain?.host)
|
||||
)) {
|
||||
name += '_with_domainId';
|
||||
args.domainId = this.domainId;
|
||||
|
||||
Reference in new issue
Block a user