From d89e9d7e446978395f3f436981573caee15fd40d Mon Sep 17 00:00:00 2001 From: JustSong Date: Fri, 27 Dec 2024 20:34:04 +0800 Subject: [PATCH 1/5] fix: add branch limitation and drop pull_request trigger for ci.yml --- .github/workflows/ci.yml | 2 -- .github/workflows/docker-image-en.yml | 2 ++ .github/workflows/docker-image.yml | 2 ++ .github/workflows/linux-release.yml | 2 ++ .github/workflows/macos-release.yml | 2 ++ .github/workflows/windows-release.yml | 2 ++ 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3034a547..3f854868 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,8 +12,6 @@ name: CI # would trigger our jobs twice on pull requests (once from "push" event and once # from "pull_request->synchronize") on: - pull_request: - types: [opened, reopened, synchronize] push: branches: - 'main' diff --git a/.github/workflows/docker-image-en.yml b/.github/workflows/docker-image-en.yml index 30cd0e38..172552ba 100644 --- a/.github/workflows/docker-image-en.yml +++ b/.github/workflows/docker-image-en.yml @@ -2,6 +2,8 @@ name: Publish Docker image (English) on: push: + branches: + - main tags: - 'v*.*.*' workflow_dispatch: diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 56f1d6ad..944b3e5d 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -2,6 +2,8 @@ name: Publish Docker image on: push: + branches: + - main tags: - 'v*.*.*' workflow_dispatch: diff --git a/.github/workflows/linux-release.yml b/.github/workflows/linux-release.yml index 161c41e3..36a8326f 100644 --- a/.github/workflows/linux-release.yml +++ b/.github/workflows/linux-release.yml @@ -4,6 +4,8 @@ permissions: on: push: + branches: + - main tags: - 'v*.*.*' - '!*-alpha*' diff --git a/.github/workflows/macos-release.yml b/.github/workflows/macos-release.yml index 94b3e47b..dc5cf08d 100644 --- a/.github/workflows/macos-release.yml +++ b/.github/workflows/macos-release.yml @@ -4,6 +4,8 @@ permissions: on: push: + branches: + - main tags: - 'v*.*.*' - '!*-alpha*' diff --git a/.github/workflows/windows-release.yml b/.github/workflows/windows-release.yml index 18641ae8..a96b334f 100644 --- a/.github/workflows/windows-release.yml +++ b/.github/workflows/windows-release.yml @@ -4,6 +4,8 @@ permissions: on: push: + branches: + - main tags: - 'v*.*.*' - '!*-alpha*' From 4f25cde132442b91d37760134ae56384ad529a49 Mon Sep 17 00:00:00 2001 From: JustSong Date: Fri, 27 Dec 2024 20:41:20 +0800 Subject: [PATCH 2/5] fix: add branch check --- .github/workflows/docker-image-en.yml | 3 +-- .github/workflows/docker-image.yml | 3 +-- .github/workflows/linux-release.yml | 3 +-- .github/workflows/macos-release.yml | 3 +-- .github/workflows/windows-release.yml | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-image-en.yml b/.github/workflows/docker-image-en.yml index 172552ba..4c67cfb7 100644 --- a/.github/workflows/docker-image-en.yml +++ b/.github/workflows/docker-image-en.yml @@ -2,8 +2,6 @@ name: Publish Docker image (English) on: push: - branches: - - main tags: - 'v*.*.*' workflow_dispatch: @@ -14,6 +12,7 @@ on: jobs: push_to_registries: name: Push Docker image to multiple registries + if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest permissions: packages: write diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 944b3e5d..b1c0fe73 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -2,8 +2,6 @@ name: Publish Docker image on: push: - branches: - - main tags: - 'v*.*.*' workflow_dispatch: @@ -15,6 +13,7 @@ jobs: push_to_registries: name: Push Docker image to multiple registries runs-on: ubuntu-latest + if: github.ref == 'refs/heads/main' permissions: packages: write contents: read diff --git a/.github/workflows/linux-release.yml b/.github/workflows/linux-release.yml index 36a8326f..ff1556f2 100644 --- a/.github/workflows/linux-release.yml +++ b/.github/workflows/linux-release.yml @@ -4,8 +4,6 @@ permissions: on: push: - branches: - - main tags: - 'v*.*.*' - '!*-alpha*' @@ -17,6 +15,7 @@ on: jobs: release: runs-on: ubuntu-latest + if: github.ref == 'refs/heads/main' steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/macos-release.yml b/.github/workflows/macos-release.yml index dc5cf08d..d98c73dd 100644 --- a/.github/workflows/macos-release.yml +++ b/.github/workflows/macos-release.yml @@ -4,8 +4,6 @@ permissions: on: push: - branches: - - main tags: - 'v*.*.*' - '!*-alpha*' @@ -17,6 +15,7 @@ on: jobs: release: runs-on: macos-latest + if: github.ref == 'refs/heads/main' steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/windows-release.yml b/.github/workflows/windows-release.yml index a96b334f..644d6fa6 100644 --- a/.github/workflows/windows-release.yml +++ b/.github/workflows/windows-release.yml @@ -4,8 +4,6 @@ permissions: on: push: - branches: - - main tags: - 'v*.*.*' - '!*-alpha*' @@ -17,6 +15,7 @@ on: jobs: release: runs-on: windows-latest + if: github.ref == 'refs/heads/main' defaults: run: shell: bash From b51c47bc77547de72f1c7a2d6c1a13b62920c4d2 Mon Sep 17 00:00:00 2001 From: JustSong <39998050+songquanpeng@users.noreply.github.com> Date: Fri, 27 Dec 2024 21:45:51 +0800 Subject: [PATCH 3/5] docs: update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 853ec067..c8600cfc 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ _✨ 通过标准的 OpenAI API 格式访问所有的大模型,开箱即用 ### 基于 Docker 进行部署 ```shell # 使用 SQLite 的部署命令: -docker run --name one-api -d --restart always -p 3000:3000 -e TZ=Asia/Shanghai -v /home/ubuntu/data/one-api:/data justsong/one-api +docker run --name one-api -d --restart always -p 3000:3000 -e TZ=Asia/Shanghai -v /home/ubuntu/data/one-api:/data ghcr.io/songquanpeng/one-api # 使用 MySQL 的部署命令,在上面的基础上添加 `-e SQL_DSN="root:123456@tcp(localhost:3306)/oneapi"`,请自行修改数据库连接参数,不清楚如何修改请参见下面环境变量一节。 # 例如: docker run --name one-api -d --restart always -p 3000:3000 -e SQL_DSN="root:123456@tcp(localhost:3306)/oneapi" -e TZ=Asia/Shanghai -v /home/ubuntu/data/one-api:/data justsong/one-api @@ -137,7 +137,7 @@ docker run --name one-api -d --restart always -p 3000:3000 -e SQL_DSN="root:1234 如果启动失败,请添加 `--privileged=true`,具体参考 https://github.com/songquanpeng/one-api/issues/482 。 -如果上面的镜像无法拉取,可以尝试使用 GitHub 的 Docker 镜像,将上面的 `justsong/one-api` 替换为 `ghcr.io/songquanpeng/one-api` 即可。 + 如果你的并发量较大,**务必**设置 `SQL_DSN`,详见下面[环境变量](#环境变量)一节。 From 999defc88b25758a30463bc32542bd31d7488b13 Mon Sep 17 00:00:00 2001 From: JustSong Date: Fri, 27 Dec 2024 21:59:38 +0800 Subject: [PATCH 4/5] chore: update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c8600cfc..853ec067 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ _✨ 通过标准的 OpenAI API 格式访问所有的大模型,开箱即用 ### 基于 Docker 进行部署 ```shell # 使用 SQLite 的部署命令: -docker run --name one-api -d --restart always -p 3000:3000 -e TZ=Asia/Shanghai -v /home/ubuntu/data/one-api:/data ghcr.io/songquanpeng/one-api +docker run --name one-api -d --restart always -p 3000:3000 -e TZ=Asia/Shanghai -v /home/ubuntu/data/one-api:/data justsong/one-api # 使用 MySQL 的部署命令,在上面的基础上添加 `-e SQL_DSN="root:123456@tcp(localhost:3306)/oneapi"`,请自行修改数据库连接参数,不清楚如何修改请参见下面环境变量一节。 # 例如: docker run --name one-api -d --restart always -p 3000:3000 -e SQL_DSN="root:123456@tcp(localhost:3306)/oneapi" -e TZ=Asia/Shanghai -v /home/ubuntu/data/one-api:/data justsong/one-api @@ -137,7 +137,7 @@ docker run --name one-api -d --restart always -p 3000:3000 -e SQL_DSN="root:1234 如果启动失败,请添加 `--privileged=true`,具体参考 https://github.com/songquanpeng/one-api/issues/482 。 - +如果上面的镜像无法拉取,可以尝试使用 GitHub 的 Docker 镜像,将上面的 `justsong/one-api` 替换为 `ghcr.io/songquanpeng/one-api` 即可。 如果你的并发量较大,**务必**设置 `SQL_DSN`,详见下面[环境变量](#环境变量)一节。 From 3915ce9814b8261a1ab13ed93adec58b463cd75c Mon Sep 17 00:00:00 2001 From: JustSong Date: Fri, 27 Dec 2024 22:01:37 +0800 Subject: [PATCH 5/5] chore: update ci yaml --- .github/workflows/docker-image-en.yml | 1 - .github/workflows/docker-image.yml | 1 - .github/workflows/linux-release.yml | 1 - .github/workflows/macos-release.yml | 1 - .github/workflows/windows-release.yml | 1 - 5 files changed, 5 deletions(-) diff --git a/.github/workflows/docker-image-en.yml b/.github/workflows/docker-image-en.yml index 4c67cfb7..30cd0e38 100644 --- a/.github/workflows/docker-image-en.yml +++ b/.github/workflows/docker-image-en.yml @@ -12,7 +12,6 @@ on: jobs: push_to_registries: name: Push Docker image to multiple registries - if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest permissions: packages: write diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b1c0fe73..56f1d6ad 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -13,7 +13,6 @@ jobs: push_to_registries: name: Push Docker image to multiple registries runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' permissions: packages: write contents: read diff --git a/.github/workflows/linux-release.yml b/.github/workflows/linux-release.yml index ff1556f2..161c41e3 100644 --- a/.github/workflows/linux-release.yml +++ b/.github/workflows/linux-release.yml @@ -15,7 +15,6 @@ on: jobs: release: runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/macos-release.yml b/.github/workflows/macos-release.yml index d98c73dd..94b3e47b 100644 --- a/.github/workflows/macos-release.yml +++ b/.github/workflows/macos-release.yml @@ -15,7 +15,6 @@ on: jobs: release: runs-on: macos-latest - if: github.ref == 'refs/heads/main' steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/windows-release.yml b/.github/workflows/windows-release.yml index 644d6fa6..18641ae8 100644 --- a/.github/workflows/windows-release.yml +++ b/.github/workflows/windows-release.yml @@ -15,7 +15,6 @@ on: jobs: release: runs-on: windows-latest - if: github.ref == 'refs/heads/main' defaults: run: shell: bash