diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index 60da40d..3b0d086 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -33,7 +33,7 @@ jobs: - name: Get old instance and snapshot name, create new instance name run: | - echo "OLD_INSTANCE_SNAPSHOT_NAME=$(aws lightsail get-instance-snapshots | grep '"name": "updateto_to_0.4.1-1676285322' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV + echo "OLD_INSTANCE_SNAPSHOT_NAME=$(aws lightsail get-instance-snapshots | grep '"name": "updateto_to_0.4.4-1684926517' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV echo "OLD_INSTANCE_NAME=$(aws lightsail get-instances | grep '"name": "CasaOS-Demo-[0-9]' | sed 's/ //g' | sed 's/"//g' | sed 's/,//g' | sed 's/name://g')" >> $GITHUB_ENV echo "NEW_INSTANCE_NAME= CasaOS-Demo-$(date +%s)" >> $GITHUB_ENV diff --git a/.github/workflows/publish_npm.yaml b/.github/workflows/publish_npm.yaml index de4c139..434084e 100644 --- a/.github/workflows/publish_npm.yaml +++ b/.github/workflows/publish_npm.yaml @@ -14,25 +14,33 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 - uses: actions/setup-node@v3 with: node-version: 16 registry-url: https://registry.npmjs.org/ + + - run: git tag --sort=-creatordate | head -n 1 - name: 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 run: | 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 - name: Generate SDK run: | npm cache clean --force npm install @openapitools/openapi-generator-cli -g - make build - run: npm i - run: npm run start - - run: npm publish -W + - run: npm publish --access public env: NODE_AUTH_TOKEN: ${{secrets.npm_token}} diff --git a/package.json b/package.json index b0ba851..704442c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "@icewhale/casaos-openapi", "version": "0.0.1", + "scripts": { "clean": "rm -rf generate", "build": "rm -rf dist && tsc && yarn clean", @@ -35,4 +36,4 @@ }, "author": "casaos", "license": "Apache-2.0" -} \ No newline at end of file +} diff --git a/route/v2/zerotier.go b/route/v2/zerotier.go index ea19777..f27d420 100644 --- a/route/v2/zerotier.go +++ b/route/v2/zerotier.go @@ -30,7 +30,6 @@ func (s *CasaOS) SetZerotierNetworkStatus(ctx echo.Context, networkId string) er fmt.Println(err) return ctx.JSON(http.StatusInternalServerError, codegen.BaseResponse{Message: utils.Ptr(err.Error())}) } - fmt.Println(string(res)) info := codegen.GetZTInfoOK{} via := gjson.GetBytes(res, "routes.0.via").Str info.Id = utils.Ptr(gjson.GetBytes(res, "id").Str)