Merge pull request #1305 from devstream-io/main

main to release-0.10

Author: daniel-hutao

.github/workflows/automated-release.yml

@@ -42,7 +42,7 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ap-southeast-1
       - name: upload core
-        run: bash -e ./hack/release/upload_assets.sh ${{ secrets.GITHUB_TOKEN }} ${{ env.TAG }} ${{ env.GOOS }} ${{ env.GOARCH }}
+        run: bash -e ./hack/release/upload_dtm_core.sh ${{ secrets.GITHUB_TOKEN }} ${{ env.TAG }} ${{ env.GOOS }} ${{ env.GOARCH }}
       - name: upload plugin
         run: aws s3 cp ~/.devstream/plugins/ s3://download.devstream.io/${{ env.TAG }}/ --recursive --acl public-read
 
@@ -77,8 +77,10 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ap-southeast-1
-      - name: upload
-        run: bash -e ./hack/release/upload_assets.sh ${{ secrets.GITHUB_TOKEN }} ${{ env.TAG }} ${{ env.GOOS }} ${{ env.GOARCH }}
-      - name: upload plugin
+      - name: update dtm version on s3
+        run: ./hack/release/update_dtm_version_on_s3.sh ${{ env.TAG }}
+      - name: upload dtm core to github release and s3
+        run: bash -e ./hack/release/upload_dtm_core.sh ${{ secrets.GITHUB_TOKEN }} ${{ env.TAG }} ${{ env.GOOS }} ${{ env.GOARCH }}
+      - name: upload plugins to s3
         run: aws s3 cp ~/.devstream/plugins/ s3://download.devstream.io/${{ env.TAG }}/ --recursive --acl public-read
 

.github/workflows/e2e-test.yml

@@ -84,7 +84,7 @@ jobs:
       - name: test 1 - clean
         run: ./dtm delete -f e2e-tools.yaml -y
       - name: test 2 - apply (apps)
-        run: ./dtm apply -f e2e-apps.yaml -y
+        run: ./dtm apply --debug -f e2e-apps.yaml -y
       - name: test 2 - apply (apps) again
         run: ./dtm apply -f e2e-apps.yaml -y
       - name: test 2 - check if pod is ready

.github/workflows/update-download-script.yml

@@ -0,0 +1,23 @@
+name: update download.sh
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - hack/install.sh
+  workflow_dispatch:
+
+jobs:
+    update-download-script:
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v3
+        - name: Configure AWS credentials
+          uses: aws-actions/configure-aws-credentials@v1
+          with:
+            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-region: ap-southeast-1
+        - name: Update download.sh
+          run: aws s3 cp hack/install/download.sh s3://download.devstream.io/download.sh --acl public-read

README.md

@@ -91,6 +91,7 @@ I am happy to tell you that we have, and we are constantly adding more possible
 so you are more than welcome to tell us what combinations you expect.
 
 - [GitOps Toolchain](https://docs.devstream.io/en/latest/best-practices/gitops/)
+- [GitLab, Jenkins and Harbor On Premise Toolchain (Chinese only for now)](https://docs.devstream.io/en/latest/best-practices/gitlab-jenkins-harbor.zh/)
 
 ## Supported DevOps Tools
 

README_zh.md

@@ -92,6 +92,7 @@ DevStream支持许多工具的管理。你可以灵活地结合一些工具来
 我们非常欢迎你告诉我们你期望的组合。
 
 - [GitOps工具链](https://docs.devstream.io/en/latest/best-practices/gitops.zh/)
+- [用 DevStream 搭建 GitLab + Jenkins + Harbor 工具链，管理 Java Spring Boot 项目开发生命周期全流程](https://docs.devstream.io/en/latest/best-practices/gitlab-jenkins-harbor.zh/)
 
 ## 支持的DevOps工具