Merge branch 'apache:master' into feature/ui/metrics

apache · Dec 17, 2023 · a667161 · a667161
2 parents 759820a + 928ab8b
commit a667161
Show file tree

Hide file tree

Showing 3 changed files with 268 additions and 177 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,12 +20,17 @@ name: Continues Integration
 
 on:
   push:
+    branches:
+      - master
   pull_request:
+    branches:
+      - master
 
 jobs:
   golangci:
     name: lint
     runs-on: ubuntu-latest
+    if: github.repository == 'apache/dubbo-kubernetes'
     steps:
       - uses: actions/checkout@v4
       - name: Set up Go 1.x
@@ -42,6 +47,7 @@ jobs:
   unit-test:
     name: Go Test
     runs-on: ubuntu-latest
+    if: github.repository == 'apache/dubbo-kubernetes'
     steps:
       - uses: actions/checkout@v4
       - name: Set up Go 1.x
@@ -66,6 +72,7 @@ jobs:
   license-check:
     name: License Check - Go
     runs-on: ubuntu-latest
+    if: github.repository == 'apache/dubbo-kubernetes'
     steps:
       - uses: actions/checkout@v4
       - name: Set up Go 1.x
@@ -79,6 +86,7 @@ jobs:
   go-fmt:
     name: Go fmt
     runs-on: ubuntu-latest
+    if: github.repository == 'apache/dubbo-kubernetes'
     steps:
       - uses: actions/checkout@v4
       - name: Set up Go 1.x

diff --git a/ui-vue3/package.json b/ui-vue3/package.json
@@ -24,10 +24,12 @@
     "ant-design-vue": "4.x",
     "less": "^4.2.0",
     "lodash": "^4.17.21",
+    "mockjs": "^1.1.0",
     "pinia": "^2.1.7",
     "vue": "^3.3.10",
     "vue-i18n": "^9.8.0",
-    "vue-router": "^4.2.5"
+    "vue-router": "^4.2.5",
+    "vue3-colorpicker": "^2.2.3"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.3.3",