From ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E5=BB=BA=E5=9B=BD?= <9340100@qq.com> Date: Wed, 6 Dec 2023 08:49:37 +0000 Subject: [PATCH] version 2.5->2.6 --- .github/workflows/docker-community.yml | 4 ++-- .github/workflows/docker-enterprise.yml | 4 ++-- .github/workflows/npm-release.yml | 10 +++++----- .github/workflows/npm-sync.yml | 6 +++--- deploy/docker/app/platform/package.json | 2 +- deploy/docker/docker-compose.yml | 2 +- deploy/enterprise/app/platform/package.json | 4 ++-- lerna.json | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/docker-community.yml b/.github/workflows/docker-community.yml index 27ecbb156f..b2de637ddd 100644 --- a/.github/workflows/docker-community.yml +++ b/.github/workflows/docker-community.yml @@ -68,11 +68,11 @@ jobs: with: registry: 252208178451.dkr.ecr.cn-northwest-1.amazonaws.com.cn - - name: Replace Version ~2.5 to Tag + - name: Replace Version ~2.6 to Tag uses: jacobtomlinson/gha-find-replace@v2 with: include: deploy/docker/app/platform/package.json - find: "~2.5" + find: "~2.6" replace: ${{env.STEEDOS_VERSION}} regex: false diff --git a/.github/workflows/docker-enterprise.yml b/.github/workflows/docker-enterprise.yml index 66bed41365..78747dd685 100644 --- a/.github/workflows/docker-enterprise.yml +++ b/.github/workflows/docker-enterprise.yml @@ -67,11 +67,11 @@ jobs: with: registry: 252208178451.dkr.ecr.cn-northwest-1.amazonaws.com.cn - - name: Replace Version ~2.5 to Tag + - name: Replace Version ~2.6 to Tag uses: jacobtomlinson/gha-find-replace@v2 with: include: deploy/enterprise/app/platform/package.json - find: "~2.5" + find: "~2.6" replace: ${{env.STEEDOS_VERSION}} regex: false diff --git a/.github/workflows/npm-release.yml b/.github/workflows/npm-release.yml index 575c482168..104b95e9cc 100644 --- a/.github/workflows/npm-release.yml +++ b/.github/workflows/npm-release.yml @@ -163,7 +163,7 @@ jobs: git config user.name github-actions git config user.email github-actions@github.com npm config set //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN - yarn lerna publish ${{ steps.branch-name.outputs.tag }} --no-git-tag-version --no-git-reset --force-publish --exact --yes + yarn lerna publish ${{ steps.branch-name.outputs.tag }} --no-git-tag-version --no-git-reset --force-publish --exact --yes --dist-tag 2.5 git add . git commit -m "action: release ${{ steps.branch-name.outputs.tag }}" git push @@ -177,7 +177,7 @@ jobs: git config user.name github-actions git config user.email github-actions@github.com npm config set //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN - yarn lerna publish ${{ steps.branch-name.outputs.tag }} --no-git-tag-version --no-git-reset --force-publish --exact --yes --dist-tag next + yarn lerna publish ${{ steps.branch-name.outputs.tag }} --no-git-tag-version --no-git-reset --force-publish --exact --yes git add . git commit -m "action: release ${{ steps.branch-name.outputs.tag }}" git push @@ -200,12 +200,12 @@ jobs: CI: false NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} - - name: Merge 2.5 -> master - if: ${{ startsWith(steps.branch-name.outputs.tag, '2.5') }} # && steps.version.outputs.is_stable == 'true'}} + - name: Merge 2.6 -> master + if: ${{ startsWith(steps.branch-name.outputs.tag, '2.6') }} # && steps.version.outputs.is_stable == 'true'}} uses: devmasx/merge-branch@master with: type: now - from_branch: 2.5 + from_branch: 2.6 target_branch: master github_token: ${{ github.token }} diff --git a/.github/workflows/npm-sync.yml b/.github/workflows/npm-sync.yml index 026f7f3bc9..ee2f4d547b 100644 --- a/.github/workflows/npm-sync.yml +++ b/.github/workflows/npm-sync.yml @@ -9,11 +9,11 @@ jobs: runs-on: ubuntu-latest steps: - # checkout branch 2.5 - - name: Checkout branch 2.5 + # checkout branch 2.6 + - name: Checkout branch 2.6 uses: actions/checkout@v2 with: - ref: '2.5' + ref: '2.6' - run: yarn --frozen-lockfile diff --git a/deploy/docker/app/platform/package.json b/deploy/docker/app/platform/package.json index 11fcae7c04..41f3044d47 100644 --- a/deploy/docker/app/platform/package.json +++ b/deploy/docker/app/platform/package.json @@ -5,6 +5,6 @@ "start": "steedos start" }, "dependencies": { - "@steedos/service-community": "~2.5" + "@steedos/service-community": "~2.6" } } \ No newline at end of file diff --git a/deploy/docker/docker-compose.yml b/deploy/docker/docker-compose.yml index 094d95c392..821f0af86c 100644 --- a/deploy/docker/docker-compose.yml +++ b/deploy/docker/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.9" services: steedos: - image: steedos/steedos-community:2.5 + image: steedos/steedos-community:2.6 ports: - "80:80" environment: diff --git a/deploy/enterprise/app/platform/package.json b/deploy/enterprise/app/platform/package.json index e67f1f35bb..d965465e99 100644 --- a/deploy/enterprise/app/platform/package.json +++ b/deploy/enterprise/app/platform/package.json @@ -5,8 +5,8 @@ "start": "steedos start" }, "dependencies": { - "@steedos/service-community": "~2.5", - "@steedos/service-enterprise": "^2.5.13", + "@steedos/service-community": "~2.6", + "@steedos/service-enterprise": "^2.5", "@steedos-labs/analytics": "^0.0.10" }, "resolutions": { diff --git a/lerna.json b/lerna.json index fb596f42b3..7736ee4975 100644 --- a/lerna.json +++ b/lerna.json @@ -8,5 +8,5 @@ ], "useWorkspaces": true, "npmClient": "yarn", - "version": "2.5.20" + "version": "2.6.2-beta.1" }