Skip to content

Commit a175137

Browse files
authored
Merge pull request #488 from HXSecurity/beta
feat: add beta、develop
2 parents 47eda6d + a700d75 commit a175137

File tree

1 file changed

+25
-12
lines changed

1 file changed

+25
-12
lines changed

.github/workflows/code-check.yml

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ on:
88
branches:
99
- main
1010
- beta
11+
- develop
1112
pull_request:
1213
branches:
1314
- main
1415
- beta
16+
- develop
1517
paths-ignore:
1618
- '.github/**'
1719
- 'changes/**'
@@ -110,6 +112,10 @@ jobs:
110112
with:
111113
maven-version: 3.2.5
112114

115+
- name: Get the release version
116+
id: version
117+
run: echo ::set-output name=GITHUB_REF::${GITHUB_REF##*/}
118+
113119
- name: Restore dependencies from cache
114120
uses: actions/cache@v2
115121
with:
@@ -135,17 +141,24 @@ jobs:
135141
endpoint: ${{ secrets.CHART_OSS_ENDPOINT }}
136142
access-key-id: ${{ secrets.OSS_KEY_ID }}
137143
access-key-secret: ${{ secrets.OSS_KEY_SECRET }}
138-
- run: |
139-
ossutil cp -rf dongtai-agent/target/dongtai-agent.jar oss://dongtai-helm-charts/agent_test/java/dongtai-agent.jar --meta x-oss-object-acl:public-read
140-
ossutil cp -rf dongtai-agent/src/main/resources/bin/ oss://dongtai-helm-charts/agent_test/java/ --meta x-oss-object-acl:public-read
141144

142-
ossutil cp -rf dongtai-agent/target/dongtai-agent.jar oss://dongtai-helm-charts/agent_test/java/latest/dongtai-agent.jar --meta x-oss-object-acl:public-read
143-
ossutil cp -rf dongtai-agent/src/main/resources/bin/ oss://dongtai-helm-charts/agent_test/java/latest/ --meta x-oss-object-acl:public-read
145+
- name: add agent
146+
if: ${{ steps.version.outputs.GITHUB_REF }} == develop || ${{ steps.version.outputs.GITHUB_REF }} == beta || ${{ steps.version.outputs.GITHUB_REF }} == main
147+
run: |
148+
if [ ${{ steps.version.outputs.GITHUB_REF }} = develop ] ; then
149+
ossutil cp -rf dongtai-agent/target/dongtai-agent.jar oss://dongtai-helm-charts/agent_test/java/latest/dongtai-agent.jar --meta x-oss-object-acl:public-read
150+
ossutil cp -rf dongtai-agent/src/main/resources/bin/ oss://dongtai-helm-charts/agent_test/java/latest/ --meta x-oss-object-acl:public-read
151+
else
152+
ossutil cp -rf dongtai-agent/target/dongtai-agent.jar oss://dongtai-helm-charts/agent_${{ steps.version.outputs.GITHUB_REF }}/java/latest/dongtai-agent.jar --meta x-oss-object-acl:public-read
153+
ossutil cp -rf dongtai-agent/src/main/resources/bin/ oss://dongtai-helm-charts/agent_${{ steps.version.outputs.GITHUB_REF }}/java/latest/ --meta x-oss-object-acl:public-read
154+
fi
155+
# ossutil cp -rf dongtai-agent/target/dongtai-agent.jar oss://dongtai-helm-charts/agent_test/java/dongtai-agent.jar --meta x-oss-object-acl:public-read
156+
# ossutil cp -rf dongtai-agent/src/main/resources/bin/ oss://dongtai-helm-charts/agent_test/java/ --meta x-oss-object-acl:public-read
144157
145-
- name: Trigger Openapi Workflow
146-
uses: benc-uk/workflow-dispatch@v1
147-
with:
148-
workflow: Deploy DongTai Server To Dev
149-
token: ${{ secrets.BIDAYA0_PAT_FOR_OPENAPI }}
150-
ref: main
151-
repo: HXSecurity/DongTai
158+
# - name: Trigger Openapi Workflow
159+
# uses: benc-uk/workflow-dispatch@v1
160+
# with:
161+
# workflow: Deploy DongTai Server To Dev
162+
# token: ${{ secrets.BIDAYA0_PAT_FOR_OPENAPI }}
163+
# ref: main
164+
# repo: HXSecurity/DongTai

0 commit comments

Comments
 (0)