From b56422139f2590a68f95df80e3dd30866f2e8c1f Mon Sep 17 00:00:00 2001 From: chenos Date: Wed, 10 Jul 2024 23:52:59 +0800 Subject: [PATCH 1/2] chore: update release ci --- .github/workflows/release-next.yml | 106 +++++++++++++++++++++++++++++ .github/workflows/release.yml | 21 +++++- 2 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/release-next.yml diff --git a/.github/workflows/release-next.yml b/.github/workflows/release-next.yml new file mode 100644 index 0000000000..2bd781e2f4 --- /dev/null +++ b/.github/workflows/release-next.yml @@ -0,0 +1,106 @@ +name: Release Next + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +on: + workflow_dispatch: + +jobs: + publish-npm: + runs-on: ubuntu-latest + container: node:18 + steps: + - name: Checkout + uses: actions/checkout@v4 + ref: next + - name: Send curl request and parse response + env: + PKG_USERNAME: ${{ secrets.PKG_USERNAME }} + PKG_PASSWORD: ${{ secrets.PKG_PASSWORD }} + run: | + mkdir git-ci-cache + apt-get update && apt-get install -y jq gh + response1=$(curl -s 'https://pkg.nocobase.com/-/verdaccio/sec/login' \ + -H 'content-type: application/json' \ + --data-raw '{"username":"'$PKG_USERNAME'","password":"'$PKG_PASSWORD'"}') + token1=$(echo $response1 | jq -r '.token') + response2=$(curl -s 'https://pkg-src.nocobase.com/-/verdaccio/sec/login' \ + -H 'content-type: application/json' \ + --data-raw '{"username":"'$PKG_USERNAME'","password":"'$PKG_PASSWORD'"}') + token2=$(echo $response2 | jq -r '.token') + echo "PKG_NOCOBASE_TOKEN=$token1" >> $GITHUB_ENV + echo "PKG_SRC_NOCOBASE_TOKEN=$token2" >> $GITHUB_ENV + - name: restore cache + id: cache + uses: actions/cache@v3 + with: + path: ./git-ci-cache + key: new-next-version-${{ github.run_id }} + - name: Set NEWVERSION variable + id: set_version + run: | + cd ./git-ci-cache + if [ -f newversion.txt ]; then + NEWVERSION=$(cat newversion.txt) + else + NEWVERSION=$(cat ../lerna.json | jq -r '.version').$(date +'%Y%m%d%H%M%S') + echo "$NEWVERSION" > newversion.txt + fi + echo "NEWVERSION=$NEWVERSION" >> $GITHUB_ENV + - name: Print NEWVERSION + run: echo "The new version is ${{ env.NEWVERSION }}" + - name: Save NEWVERSION to cache + run: echo "NEWVERSION=$NEWVERSION" >> ./git-ci-cache/newversion.txt + - name: save cache + id: save-cache + uses: actions/cache/save@v3 + if: steps.cache.outputs.cache-hit != 'true' + with: + path: ./git-ci-cache + key: new-next-version-${{ github.run_id }} + - name: publish npmjs.org + continue-on-error: true + run: | + git config --global user.email "test@mail.com" + git config --global user.name "test" + git config --global --add safe.directory /__w/nocobase/nocobase + npm config set access public + npm config set registry https://registry.npmjs.org/ + npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }} + yarn config set access public + yarn config set registry https://registry.npmjs.org/ + yarn config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }} + yarn install + yarn lerna version ${{ env.NEWVERSION }} -y --no-git-tag-version + yarn build + echo "# test" >> Release.md + git add . + git commit -m "chore(versions): test publish packages xxx" + cat lerna.json + yarn release:force --no-verify-access --no-git-reset --registry https://registry.npmjs.org/ --dist-tag=next + - name: Checkout pro-plugins + uses: actions/checkout@v3 + with: + repository: nocobase/pro-plugins + path: packages/pro-plugins + ref: next + ssh-key: ${{ secrets.SUBMODULE_SSH_KEY }} + - name: Build Pro plugins + continue-on-error: true + run: | + yarn config set registry https://registry.npmjs.org/ + yarn install + yarn build packages/pro-plugins + - name: publish pkg.nocobase.com + run: | + git reset --hard + npm config set //pkg.nocobase.com/:_authToken=${{ env.PKG_NOCOBASE_TOKEN }} + yarn release:force --no-verify-access --no-git-reset --registry https://pkg.nocobase.com --dist-tag=next + - name: publish pkg-src.nocobase.com + run: | + git reset --hard + bash generate-npmignore.sh ignore-src + npm config set //pkg-src.nocobase.com/:_authToken=${{ env.PKG_SRC_NOCOBASE_TOKEN }} + yarn release:force --no-verify-access --no-git-reset --registry https://pkg-src.nocobase.com --dist-tag=next diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 392ebc45a8..9c102d6a28 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,23 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Send curl request and parse response + env: + PKG_USERNAME: ${{ secrets.PKG_USERNAME }} + PKG_PASSWORD: ${{ secrets.PKG_PASSWORD }} + run: | + mkdir git-ci-cache + apt-get update && apt-get install -y jq + response1=$(curl -s 'https://pkg.nocobase.com/-/verdaccio/sec/login' \ + -H 'content-type: application/json' \ + --data-raw '{"username":"'$PKG_USERNAME'","password":"'$PKG_PASSWORD'"}') + token1=$(echo $response1 | jq -r '.token') + response2=$(curl -s 'https://pkg-src.nocobase.com/-/verdaccio/sec/login' \ + -H 'content-type: application/json' \ + --data-raw '{"username":"'$PKG_USERNAME'","password":"'$PKG_PASSWORD'"}') + token2=$(echo $response2 | jq -r '.token') + echo "PKG_NOCOBASE_TOKEN=$token1" >> $GITHUB_ENV + echo "PKG_SRC_NOCOBASE_TOKEN=$token2" >> $GITHUB_ENV - name: yarn install and build run: | yarn config set registry https://registry.npmjs.org/ @@ -53,13 +70,13 @@ jobs: - name: publish pkg.nocobase.com run: | git reset --hard - npm config set //pkg.nocobase.com/:_authToken=${{ secrets.PKG_NOCOBASE_TOKEN }} + npm config set //pkg.nocobase.com/:_authToken=${{ env.PKG_NOCOBASE_TOKEN }} yarn release:force --no-verify-access --no-git-reset --registry https://pkg.nocobase.com - name: publish pkg-src.nocobase.com run: | git reset --hard bash generate-npmignore.sh ignore-src - npm config set //pkg-src.nocobase.com/:_authToken=${{ secrets.PKG_SRC_NOCOBASE_TOKEN }} + npm config set //pkg-src.nocobase.com/:_authToken=${{ env.PKG_SRC_NOCOBASE_TOKEN }} yarn release:force --no-verify-access --no-git-reset --registry https://pkg-src.nocobase.com push-docker: runs-on: ubuntu-latest From a7a0c41d30d36f19f10e0f241642ea88cd7fef6f Mon Sep 17 00:00:00 2001 From: chenos Date: Wed, 10 Jul 2024 23:55:28 +0800 Subject: [PATCH 2/2] fix: unexpected value 'ref' --- .github/workflows/release-next.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-next.yml b/.github/workflows/release-next.yml index 2bd781e2f4..188d4186f3 100644 --- a/.github/workflows/release-next.yml +++ b/.github/workflows/release-next.yml @@ -14,7 +14,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - ref: next + with: + ref: next - name: Send curl request and parse response env: PKG_USERNAME: ${{ secrets.PKG_USERNAME }}