Skip to content

Commit

Permalink
chore(other): 使用 self-hosted 作为 github runner #2291
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangzhw8 committed Dec 2, 2023
1 parent 7059a82 commit 410551c
Show file tree
Hide file tree
Showing 23 changed files with 68 additions and 100 deletions.
28 changes: 10 additions & 18 deletions .github/configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
"categories": [
{
"title": "### 🔥 Refactors",
"labels": ["kind/refactor", "refactor", "refactor(front)"]
"labels": ["kind/refactor", "refactor", "refactor"]
},
{
"title": "### 🚀 Features",
"labels": ["kind/feature", "feature", "feat(front)"]
"labels": ["kind/feature", "feature", "feat"]
},
{
"title": "### ✨ Optimizations",
"labels": ["kind/optimization", "optimization", "perf(front)", "optimize(front)", "style(front)"]
"labels": ["kind/optimization", "optimization", "perf", "optimize", "style"]
},
{
"title": "### 🐛 Bugfixes",
"labels": ["kind/bugfix", "bugfix", "fix(front)"]
"labels": ["kind/bugfix", "bugfix", "fix"]
},
{
"title": "### ✏️ Docs",
"labels": ["kind/docs", "docs", "docs(front)"]
"labels": ["kind/docs", "docs", "docs"]
},
{
"title": "### 🧪 Tests",
"labels": ["kind/test", "test", "test(front)"]
"labels": ["kind/test", "test", "test"]
},
{
"title": "## 📦 Dependencies",
"labels": ["build(front)"]
"labels": ["build"]
}
],
"sort": "ASC",
Expand All @@ -35,12 +35,8 @@
"empty_template": "- no changes",
"label_extractor": [
{
"pattern": "^(feature|docs|bugfix|optimization|refactor|test):(.*)",
"pattern": "^(feat|feature|fix|bugfix|refactor|docs|test|style|chore)(.*)",
"target": "$1"
},
{
"pattern": "^(refactor|feat|perf|optimize|fix|docs|test|build|style)\\(front\\):(.*)",
"target": "$1(front)"
}
],
"duplicate_filter": {
Expand All @@ -50,12 +46,8 @@
},
"transformers": [
{
"pattern": "^(feature|docs|bugfix|optimization|refactor|test):\\s*(.*)",
"target": "$2"
},
{
"pattern": "^(feature|docs|bugfix|optimization|refactor|test)\\(front\\):\\s*(.*)",
"pattern": "^(feat|feature|fix|bugfix|refactor|docs|test|style|chore)(.*)",
"target": "$2"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Commit Message Check
name: Auto Create Release

on:
push:
Expand All @@ -9,7 +9,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- id: checkout
name: Checkout
Expand All @@ -22,6 +22,18 @@ jobs:
file: 'helm-charts/bk-dbm/Chart.yaml'
key-path: '["version"]'

- id: create-temporary-tag
name: Create temporary tag
uses: actions/github-script@v6
with:
script: |
github.rest.git.createRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: 'refs/tags/v${{ steps.yaml-data.outputs.data }}',
sha: context.sha
})
- id: build-release-log
name: Build release log
uses: mikepenz/[email protected]
Expand All @@ -33,40 +45,40 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- id: delete-temporary-tag
name: Delete temporary tag
uses: actions/github-script@v6
with:
# 参考 https://octokit.github.io/rest.js/v18#git-delete-ref
# 参考 https://github.com/actions/github-script
script: |
github.rest.git.deleteRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: 'tags/v${{ steps.yaml-data.outputs.data }}'
})
- id: create-tag
name: Create tag
uses: actions/github-script@v6
with:
script: |
const tagName = '${{ steps.yaml-data.outputs.data }}';
const tagMessage = '${{ steps.build-release-log.outputs.changelog }}';
// Create a lightweight tag
await github.rest.git.createRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: `refs/tags/${tagName}`,
ref: 'refs/tags/${{ steps.yaml-data.outputs.data }}',
sha: context.sha
});
// Create a tag object
const tagObject = await github.rest.git.createTag({
owner: context.repo.owner,
repo: context.repo.repo,
tag: tagName,
message: tagMessage,
object: context.sha,
type: 'commit'
});
// Create a new release with the tag
await github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: tagName,
name: tagName,
body: tagMessage
});
// Output the name of the created tag to use in other steps
return tagName;
- id: create-release
name: Create release
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ steps.yaml-data.outputs.data }}
release_name: ${{ steps.yaml-data.outputs.data }}
body: ${{ steps.build-release-log.outputs.changelog }}
draft: false
prerelease: true
2 changes: 1 addition & 1 deletion dbm-ui/backend/db_services/dbresource/views/resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from backend.components.dbresource.client import DBResourceApi
from backend.configuration.constants import SystemSettingsEnum
from backend.configuration.models import SystemSettings
from backend.db_meta.models import AppCache, Spec
from backend.db_meta.models import AppCache
from backend.db_services.dbresource.constants import (
GSE_AGENT_RUNNING_CODE,
RESOURCE_IMPORT_EXPIRE_TIME,
Expand Down
4 changes: 2 additions & 2 deletions dbm-ui/backend/db_services/mysql/cluster/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from functools import reduce
from typing import Any, Dict, List, Set

from django.db.models import ExpressionWrapper, F, IntegerField, Prefetch, Q, Value
from django.db.models import Prefetch, Q
from django.db.models.query import QuerySet
from django.forms import model_to_dict
from django.utils.translation import ugettext_lazy as _
Expand All @@ -29,7 +29,7 @@
TenDBClusterSpiderRole,
)
from backend.db_meta.exceptions import InstanceNotExistException
from backend.db_meta.models import Cluster, DBModule, ProxyInstance, StorageInstance, TenDBClusterSpiderExt
from backend.db_meta.models import Cluster, DBModule, ProxyInstance, StorageInstance
from backend.db_meta.models.machine import Machine
from backend.db_services.mysql.dataclass import ClusterFilter, DBInstance

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@
from django.utils.translation import gettext_lazy as _
from rest_framework import serializers

from backend.db_meta.enums.cluster_type import ClusterType
from backend.db_services.mysql.permission.authorize import mock_data
from backend.db_services.mysql.permission.constants import AUTHORIZE_EXCEL_HEADER
from backend.utils.excel import ExcelHandler


class AuthorizeApplySerializer(serializers.Serializer):
bk_biz_id = serializers.IntegerField(help_text=_("业务ID"), required=False)
Expand Down
1 change: 0 additions & 1 deletion dbm-ui/backend/db_services/redis/autofix/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
"""
from dataclasses import dataclass, field

from django.utils.translation import ugettext_lazy as _

Expand Down
12 changes: 1 addition & 11 deletions dbm-ui/backend/db_services/redis/rollback/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,17 @@
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
"""
import base64
import copy
import json
import logging.config
import re
from collections import defaultdict
from concurrent.futures import ThreadPoolExecutor, as_completed
from datetime import datetime, timedelta
from typing import Any, Callable, Dict, List, Union
from typing import Any, Dict, List, Union

from django.conf import settings
from django.db.models import Q
from django.utils.translation import ugettext as _
from jinja2 import Environment

from backend import env
from backend.components import JobApi
from backend.components.bklog.client import BKLogApi
from backend.constants import DATETIME_PATTERN
from backend.db_meta.enums import ClusterType, InstanceInnerRole
from backend.db_meta.models import StorageInstance
from backend.db_meta.models.cluster import Cluster
from backend.db_services.redis.rollback.constants import BACKUP_LOG_ROLLBACK_TIME_RANGE_DAYS
from backend.exceptions import AppBaseException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,13 @@
specific language governing permissions and limitations under the License.
"""
import logging
from dataclasses import asdict

from django.utils.translation import ugettext as _

from backend.flow.consts import CloudServiceName
from backend.flow.engine.bamboo.scene.cloud.base_service_flow import CloudBaseServiceFlow
from backend.flow.engine.bamboo.scene.cloud.dbha_service_flow import CloudDBHAServiceFlow
from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder
from backend.flow.plugins.components.collections.cloud.exec_service_script import ExecCloudScriptComponent
from backend.flow.plugins.components.collections.cloud.service_proxy import CloudProxyComponent
from backend.flow.utils.cloud.cloud_act_payload import CloudServiceActPayload
from backend.flow.utils.cloud.cloud_context_dataclass import CloudDRSKwargs, CloudProxyKwargs, CloudServiceActKwargs
from backend.flow.utils.cloud.cloud_db_proxy import CloudDBProxy
from backend.flow.utils.cloud.script_template import nginx_stop_template

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from django.utils.translation import ugettext as _

from backend.configuration.constants import DBType
from backend.flow.consts import ES_DEFAULT_INSTANCE_NUM, ManagerDefaultPort, ManagerOpType, ManagerServiceType
from backend.flow.consts import ManagerDefaultPort, ManagerOpType, ManagerServiceType
from backend.flow.engine.bamboo.scene.common.builder import Builder
from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList
from backend.flow.engine.bamboo.scene.es.es_flow import EsFlow, get_node_in_ticket_preferred_hot
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
MySQLDownloadBackupfileComponent,
)
from backend.flow.plugins.components.collections.mysql.mysql_rollback_data_download_binlog import (
MySQLRollbackDownloadBinlog,
MySQLRollbackDownloadBinlogComponent,
)
from backend.flow.plugins.components.collections.mysql.rollback_local_trans_flies import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,20 @@
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
"""
import logging
import logging.config
from dataclasses import asdict
from typing import Dict, Optional
from typing import Dict

from django.utils.translation import ugettext as _

from backend.configuration.constants import DBType
from backend.db_meta.enums import InstanceRole
from backend.db_meta.models import AppCache
from backend.flow.engine.bamboo.scene.common.builder import SubBuilder
from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList
from backend.flow.plugins.components.collections.redis.exec_actuator_script import ExecuteDBActuatorScriptComponent
from backend.flow.plugins.components.collections.redis.redis_db_meta import RedisDBMetaComponent
from backend.flow.plugins.components.collections.redis.trans_flies import TransFileComponent
from backend.flow.utils.redis.redis_act_playload import RedisActPayload
from backend.flow.utils.redis.redis_context_dataclass import ActKwargs
from backend.flow.utils.redis.redis_db_meta import RedisDBMeta

logger = logging.getLogger("flow")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@
"""
import logging.config
from dataclasses import asdict
from typing import Dict, List, Optional
from typing import List

from django.utils.translation import ugettext as _

from backend.configuration.constants import DBType
from backend.constants import IP_PORT_DIVIDER
from backend.db_meta.api.cluster import nosqlcomm
from backend.db_meta.enums import ClusterType
from backend.flow.consts import SwitchType, SyncType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,18 @@
from collections import defaultdict
from copy import deepcopy
from dataclasses import asdict
from typing import Any, Dict, List, Optional
from typing import Dict, Optional

from django.utils.translation import ugettext as _

from backend.components import DBConfigApi
from backend.configuration.constants import DBType
from backend.constants import IP_PORT_DIVIDER
from backend.db_meta import api
from backend.db_meta.enums import ClusterType, InstanceRole, InstanceStatus
from backend.db_meta.enums import InstanceRole, InstanceStatus
from backend.db_meta.models import AppCache, Cluster, StorageInstance
from backend.flow.consts import DEFAULT_LAST_IO_SECOND_AGO, DEFAULT_MASTER_DIFF_TIME, SyncType
from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder
from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList
from backend.flow.engine.bamboo.scene.redis.atom_jobs import RedisBatchShutdownAtomJob, RedisClusterSwitchAtomJob
from backend.flow.engine.bamboo.scene.redis.atom_jobs import RedisClusterSwitchAtomJob
from backend.flow.plugins.components.collections.redis.exec_actuator_script import ExecuteDBActuatorScriptComponent
from backend.flow.plugins.components.collections.redis.get_redis_payload import (
GetRedisActPayloadComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
specific language governing permissions and limitations under the License.
"""
import copy
import json
import logging.config
from dataclasses import asdict
from typing import Dict, Optional
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from backend.flow.consts import DBA_ROOT_USER
from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder
from backend.flow.engine.bamboo.scene.common.get_file_list import GetFileList
from backend.flow.plugins.components.collections.common.pause import PauseComponent
from backend.flow.plugins.components.collections.riak.exec_actuator_script import ExecuteRiakActuatorScriptComponent
from backend.flow.plugins.components.collections.riak.get_riak_cluster_node import GetRiakClusterNodeComponent
from backend.flow.plugins.components.collections.riak.riak_db_meta import RiakDBMetaComponent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
"""
import copy
from dataclasses import asdict

from django.utils.translation import ugettext as _
Expand All @@ -25,7 +24,6 @@
from backend.flow.utils.mysql.common.compare_time import compare_time
from backend.flow.utils.mysql.mysql_act_dataclass import DownloadBackupFileKwargs, ExecActuatorKwargs
from backend.flow.utils.mysql.mysql_act_playload import MysqlActPayload
from backend.utils import time


def spider_recover_sub_flow(root_id: str, ticket_data: dict, cluster: dict):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import copy
import logging
from dataclasses import asdict
from typing import Dict, List, Optional
from typing import Dict, Optional

from django.utils.translation import ugettext as _

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from django.utils.translation import ugettext as _

from backend.db_meta.enums import ClusterEntryRole, ClusterEntryType, TenDBClusterSpiderRole
from backend.db_meta.models import Cluster, ClusterEntry, ProxyInstance
from backend.db_meta.models import Cluster, ProxyInstance
from backend.flow.engine.bamboo.scene.common.builder import Builder, SubBuilder
from backend.flow.engine.bamboo.scene.spider.common.common_sub_flow import reduce_spider_slaves_flow
from backend.flow.plugins.components.collections.common.pause import PauseComponent
Expand Down
Loading

0 comments on commit 410551c

Please sign in to comment.