From 52ef8900ff20b646bda08669c644619716b35336 Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Fri, 8 Mar 2024 19:15:03 +0800 Subject: [PATCH 1/2] ci(custom): --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 1f75e1c..928c3ad 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,7 +27,7 @@ steps: image: node:20-alpine when: branch: - - master + - main commands: - npm config set registry https://registry.npmmirror.com/ - npm install -g pnpm From d1b8a8fc61866fb4c551d53c733ddb3afb3f0b0a Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Fri, 8 Mar 2024 20:53:26 +0800 Subject: [PATCH 2/2] ci(custom): --- .drone.yml | 12 ---- .idea/.gitignore | 5 -- .idea/admin.iml | 12 ---- .idea/codeStyles/Project.xml | 65 -------------------- .idea/codeStyles/codeStyleConfig.xml | 5 -- .idea/git_toolbox_prj.xml | 15 ----- .idea/inspectionProfiles/Project_Default.xml | 6 -- .idea/jsLibraryMappings.xml | 6 -- .idea/jsLinters/eslint.xml | 6 -- .idea/modules.xml | 8 --- .idea/prettier.xml | 6 -- .idea/vcs.xml | 6 -- 12 files changed, 152 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/admin.iml delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/git_toolbox_prj.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/jsLibraryMappings.xml delete mode 100644 .idea/jsLinters/eslint.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/prettier.xml delete mode 100644 .idea/vcs.xml diff --git a/.drone.yml b/.drone.yml index 928c3ad..fb39dd7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -77,14 +77,8 @@ steps: - rm -rf dist.tar - cd jdt-admin-dev - docker build -t jdt-admin-dev . - - target_container="jdt-admin-dev" - - if docker ps -a --format '{{.Names}}' | grep -q "^$target_container$"; then - - echo "容器存在,执行操作..." - docker stop jdt-admin-dev - docker rm jdt-admin-dev - - else - - echo "容器不存在" - - fi - docker run -d -p 8085:80 --restart=always --name jdt-admin-dev jdt-admin-dev - cd .. - rm -rf jdt-admin-dev @@ -129,14 +123,8 @@ steps: - rm -rf dist.tar - cd jdt-admin-prod - cd docker build -t jdt-admin-prod . - - target_container="jdt-admin-prod" - - if docker ps -a --format '{{.Names}}' | grep -q "^$target_container$"; then - - echo "容器存在,执行操作..." - docker stop jdt-admin-prod - docker rm jdt-admin-prod - - else - - echo "容器不存在" - - fi - docker run -d -p 8085:80 --restart=always --name jdt-admin-prod jdt-admin-prod - cd .. - rm -rf jdt-admin-prod diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 10b731c..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ diff --git a/.idea/admin.iml b/.idea/admin.iml deleted file mode 100644 index 0b872d8..0000000 --- a/.idea/admin.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 7b84c3a..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 307554b..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml deleted file mode 100644 index 38839fe..0000000 --- a/.idea/git_toolbox_prj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 03d9549..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml deleted file mode 100644 index 63326a8..0000000 --- a/.idea/jsLibraryMappings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/jsLinters/eslint.xml b/.idea/jsLinters/eslint.xml deleted file mode 100644 index e94fc66..0000000 --- a/.idea/jsLinters/eslint.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 00e73a1..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/prettier.xml b/.idea/prettier.xml deleted file mode 100644 index 8bc49dc..0000000 --- a/.idea/prettier.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index c8397c9..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file