From 44de90bcab904f703d7298b4b26434d08968409a Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 23 Jul 2021 13:14:28 +0800 Subject: [PATCH] ci: fix --- .github/workflows/build.yml | 104 ++++++++++++------------- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/service/server.ts | 2 +- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc3783bd..07f5cc95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 }} \ No newline at end of file + # 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 }} \ No newline at end of file diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 603ac5aa..f5cc4a9d 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -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", diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts index aabd05ac..acc1f4d1 100644 --- a/packages/hydrooj/src/service/server.ts +++ b/packages/hydrooj/src/service/server.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;