瀏覽代碼

Update publish_npm.yaml (#1120)

Signed-off-by: 李旭海 <lxh_shine@hotmail.com>
Signed-off-by: zhanghengxin <812718649@qq.com>
Co-authored-by: zhanghengxin <812718649@qq.com>
李旭海 2 年之前
父節點
當前提交
c5de0319fb
共有 2 個文件被更改,包括 14 次插入5 次删除
  1. 12 4
      .github/workflows/publish_npm.yaml
  2. 2 1
      package.json

+ 12 - 4
.github/workflows/publish_npm.yaml

@@ -14,25 +14,33 @@ jobs:
     runs-on: ubuntu-22.04
     runs-on: ubuntu-22.04
     steps:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - uses: actions/setup-node@v3
       - uses: actions/setup-node@v3
         with:
         with:
           node-version: 16
           node-version: 16
           registry-url: https://registry.npmjs.org/
           registry-url: https://registry.npmjs.org/
+          
+      - run: git tag --sort=-creatordate | head -n 1
       - name: Get version
       - name: Get version
         id: get_version
         id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+        run: echo "VERSION=$(git tag --sort=-creatordate | head -n 1)" >> $GITHUB_OUTPUT
+      - name: Get commit id
+        id: get_commit_id
+        run: echo "COMMIT_ID=$( git rev-parse --short "$GITHUB_SHA" )" >> $GITHUB_OUTPUT
+        
+      - run: echo "${{ steps.get_version.outputs.VERSION }}-${{ steps.get_commit_id.outputs.COMMIT_ID }}"
       - name: Set version
       - name: Set version
         run: |
         run: |
           sudo apt-get install jq
           sudo apt-get install jq
-          jq '.version="${{ steps.get_version.outputs.VERSION }}"' package.json > package.json.new
+          jq '.version="${{ steps.get_version.outputs.VERSION }}-${{ steps.get_commit_id.outputs.COMMIT_ID }}"' package.json > package.json.new
           mv package.json.new package.json
           mv package.json.new package.json
       - name: Generate SDK
       - name: Generate SDK
         run: |
         run: |
           npm cache clean --force
           npm cache clean --force
           npm install @openapitools/openapi-generator-cli -g
           npm install @openapitools/openapi-generator-cli -g
-          make build
       - run: npm i
       - run: npm i
       - run: npm run start
       - run: npm run start
-      - run: npm publish -W
+      - run: npm publish --access public
         env:
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}

+ 2 - 1
package.json

@@ -1,6 +1,7 @@
 {
 {
   "name": "@icewhale/casaos-openapi",
   "name": "@icewhale/casaos-openapi",
   "version": "0.0.1",
   "version": "0.0.1",
+  
   "scripts": {
   "scripts": {
     "clean": "rm -rf generate",
     "clean": "rm -rf generate",
     "build": "rm -rf dist && tsc && yarn clean",
     "build": "rm -rf dist && tsc && yarn clean",
@@ -35,4 +36,4 @@
   },
   },
   "author": "casaos",
   "author": "casaos",
   "license": "Apache-2.0"
   "license": "Apache-2.0"
-}
+}