Merge pull request #372 from qianmoQ/feature-ui-tiny-ng

[Env] [Ci] Fixed github ci
devlive-community · Nov 2, 2023 · c9e3b91 · c9e3b91
2 parents 8fcccc5 + 1c89290
commit c9e3b91
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 70 deletions.
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -1,5 +1,8 @@
 name: Publish docs via GitHub Pages
-on: push
+
+on:
+  release:
+    types: [ published ]
 
 jobs:
   build:
@@ -8,12 +11,11 @@ jobs:
     steps:
       - name: Checkout main
         uses: actions/checkout@v2
-
       - name: Deploy docs
         uses: mhausenblas/mkdocs-deploy-gh-pages@master
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CUSTOM_DOMAIN: dbm.inke.io
+          GITHUB_TOKEN: ${{ secrets.TOKEN }}
+          CUSTOM_DOMAIN: dbm.devlive.org
           CONFIG_FILE: docs/mkdocs.yml
           EXTRA_PACKAGES: build-base
           REQUIREMENTS: docs/requirements.txt
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -1,28 +1,22 @@
-name: Publish New Release
+name: Publish new version
 
 on:
-  push
-  # pull_request:
-  #   branch:
-  #     - 'master'
-  #   types: [ closed ]
+  release:
+    types: [ published ]
 
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-
       - name: Checkout
         uses: actions/checkout@master
         with:
           node-version: 16
-
       - name: Read package.json
         id: package-version
         uses: tyankatsu0105/read-package-version-actions@v1
         with:
           path: './'
-
       - name: Create Release
         id: create_release
         uses: actions/create-release@master
@@ -41,20 +35,18 @@ jobs:
     runs-on: macos-latest
     needs: release
     steps:
-
       - name: Checkout
         uses: actions/checkout@master
         with:
           node-version: 16
-
       - name: Build
         uses: actions/setup-node@master
-      - run: npm cache clear --force
-      - run: npm install yarn --legacy-peer-deps
-      - run: yarn add ajv-formats
-      - run: yarn install
-      - run: yarn run release
-
+      - run: |
+          npm cache clear --force
+          npm install yarn --legacy-peer-deps
+          yarn add ajv-formats
+          yarn install
+          yarn run release
       - name: Upload Release Asset For dmg
         uses: actions/upload-release-asset@master
         env:
@@ -64,7 +56,6 @@ jobs:
           asset_path: ./release/dbm-${{ needs.release.outputs.version }}-mac-x64.dmg
           asset_name: dbm-${{ needs.release.outputs.version }}-mac-x64.dmg
           asset_content_type: application/x-tg
-
       - name: Upload Release Asset For zip
         uses: actions/upload-release-asset@master
         env:
@@ -74,7 +65,6 @@ jobs:
           asset_path: ./release/dbm-${{ needs.release.outputs.version }}-mac-x64.zip
           asset_name: dbm-${{ needs.release.outputs.version }}-mac-x64.zip
           asset_content_type: application/zip
-
       - name: Upload Release Asset For yml
         uses: actions/upload-release-asset@master
         env:
@@ -85,39 +75,22 @@ jobs:
           asset_name: latest-mac-inter.yml
           asset_content_type: application/x-yaml
 
-      - name: Download and upload to qiniu
-        run: |
-          wget https://devtools.qiniu.com/qshell-v2.6.2-darwin-amd64.tar.gz
-          tar -xvzf qshell-v2.6.2-darwin-amd64.tar.gz
-          # echo '--------- Start ---------'
-          # ./qshell account ${{ env.TOKEN_AK }} ${{ env.TOKEN_SK }}
-          # echo '--------- End ---------'
-          ./qshell account 5eua7TZfgnNb81gmVUBcw4x7PpQuy-v9v1iFyD1R zCwoByIkA9AnlK0qO0DGveH7dKDXLG3CRqZ2mlTW dbm_qiniu
-          ./qshell fput edurtio-other dbm/releases/darwin/x64/dbm-${{ needs.release.outputs.version }}-mac-x64.dmg ./release/dbm-${{ needs.release.outputs.version }}-mac-x64.dmg --overwrite
-          ./qshell fput edurtio-other dbm/releases/darwin/x64/dbm-${{ needs.release.outputs.version }}-mac-x64.zip ./release/dbm-${{ needs.release.outputs.version }}-mac-x64.zip --overwrite
-          ./qshell fput edurtio-other dbm/releases/darwin/x64/latest-mac.yml ./release/latest-mac.yml --overwrite
-
-
-
-
   build-win:
     runs-on: windows-latest
     needs: release
     steps:
-
       - name: Checkout
         uses: actions/checkout@master
-
       - name: Build
         uses: actions/setup-node@master
         with:
           node-version: 16
-      - run: npm cache clear --force
-      - run: npm install yarn --legacy-peer-deps
-      - run: yarn add ajv-formats
-      - run: yarn install
-      - run: yarn run release
-
+      - run: |
+          npm cache clear --force
+          npm install yarn --legacy-peer-deps
+          yarn add ajv-formats
+          yarn install
+          yarn run release
       - name: Upload Release Asset
         id: upload-release-asset
         uses: actions/upload-release-asset@master
@@ -128,14 +101,3 @@ jobs:
           asset_path: ./release/dbm-${{ needs.release.outputs.version }}-windows-x64-nsis-installer.exe
           asset_name: dbm-${{ needs.release.outputs.version }}-windows-x64-nsis-installer.exe
           asset_content_type: application/octet-stream
-
-      - name: Download and upload to qiniu
-        run: |
-          echo '--------- Start ---------'
-
-          certutil.exe -urlcache -split -f  https://github.com/qianmoQ/assets/raw/main/windows/qshell.exe
-          ./qshell account 5eua7TZfgnNb81gmVUBcw4x7PpQuy-v9v1iFyD1R zCwoByIkA9AnlK0qO0DGveH7dKDXLG3CRqZ2mlTW dbm_qiniu
-          ./qshell fput edurtio-other dbm/releases/windows/x64/dbm-${{ needs.release.outputs.version }}-windows-x64-nsis-installer.exe ./release/dbm-${{ needs.release.outputs.version }}-windows-x64-nsis-installer.exe --overwrite
-          ./qshell fput edurtio-other dbm/releases/windows/x64/latest-win.yml ./release/latest-win.yml --overwrite
-
-          echo '--------- End ---------'
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2021] [dbm of copyright EdurtIO]
+   Copyright [2023] [dbm of copyright Devlive Community]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/docs/CNAME b/docs/CNAME
@@ -1 +1 @@
-dbm.edurt.io
+dbm.devlive.org
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
@@ -1,14 +1,14 @@
 site_name: Database GUI
-site_url: https://dbm.edurt.io/
+site_url: https://dbm.devlive.org
 site_author: qinamoQ
 site_description: >-
   Full platform database management tool, supports ClickHouse, Presto, Trino
 
-repo_name: EdurtIO/dbm
-repo_url: https://github.com/EdurtIO/dbm
-edit_uri: "https://github.com/EdurtIO/dbm/blob/master/docs/docs"
+repo_name: devlive-community/dbm
+repo_url: https://github.com/devlive-community/dbm
+edit_uri: "https://github.com/devlive-community/dbm/blob/dev/docs/docs"
 
-copyright: Copyright &copy; 2021 EdurtIO
+copyright: Copyright &copy; 2023 Devlive Community
 
 theme:
   name: null

diff --git a/electron-builder.yml b/electron-builder.yml
@@ -1,4 +1,4 @@
-appId: 'io.edurt.dbm'
+appId: 'org.devlive.dbm'
 
 artifactName: ${name}-${version}-${os}-${arch}.${ext}
 

diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "dbm",
-  "version": "1.23.0",
-  "author": "qianmoQ <shicheng@ttxit.com>",
+  "version": "1.24.0",
+  "author": "qianmoQ <shicheng@devlive.org>",
   "description": "Full platform database management tool, supports ClickHouse, Presto, Trino, MySQL, PostgreSQL...",
-  "github": "https://github.com/EdurtIO/dbm.git",
-  "homepage": "https://dbm.edurt.io",
+  "github": "https://github.com/devlive-community/dbm.git",
+  "homepage": "https://dbm.devlive.org",
   "keywords": [
     "angular",
     "angular 12",
@@ -75,7 +75,7 @@
     "ng-zorro-antd": "13.3.1",
     "ngx-ace-wrapper": "^12.0.0",
     "ngx-clipboard": "^14.0.2",
-    "ngx-easy-table": "^15.2.0",
+    "ngx-easy-table": "15.2.0",
     "ngx-ellipsis": "^3.1.6",
     "ngx-markdown": "^13.1.0",
     "ngx-moment": "^6.0.2",