Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

main to release-0.10 #1305

Merged
merged 36 commits into from
Dec 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
1727786
docs: update quickstart
IronCore864 Dec 2, 2022
4304009
feat: jenkins pipeline support offline
steinliber Dec 2, 2022
b91239a
Merge pull request #1292 from devstream-io/docs-update-quickstart
aFlyBird0 Dec 2, 2022
461af71
Merge pull request #1293 from merico-dev/feat-jenkins-pipeline-suppor…
aFlyBird0 Dec 2, 2022
6494965
fix: add docs for jenkins-pipeline offline options
steinliber Dec 2, 2022
ebc4895
docs: update quickstart of Chinese version
aFlyBird0 Dec 2, 2022
a762fe3
style: beautify quickstart docs
aFlyBird0 Dec 2, 2022
ca02149
docs: add app config detail docs
steinliber Dec 2, 2022
37830ba
feat: upload dtm core to aws s3
aFlyBird0 Dec 4, 2022
5162e08
feat: upload download.sh to s3 and auto release
aFlyBird0 Dec 4, 2022
6bdde74
Merge pull request #1297 from aFlyBird0/update-docs-quickstart-cn
daniel-hutao Dec 5, 2022
6ffb8be
Merge pull request #1294 from merico-dev/feat-jenkins-pipeline-suppor…
daniel-hutao Dec 5, 2022
d745f84
Merge pull request #1295 from merico-dev/docs-apps-detail
daniel-hutao Dec 5, 2022
5d5a6bd
test: enable debug log for e2e
IronCore864 Dec 5, 2022
f07037f
Merge pull request #1302 from devstream-io/e2e-debug-log
IronCore864 Dec 5, 2022
4b78ee8
fix: typo spring boot
aFlyBird0 Dec 5, 2022
0c084e1
fix: e2e test error in ci file getter
steinliber Dec 5, 2022
6e15b53
Merge pull request #1301 from aFlyBird0/feat-upload-dtm-to-s3
aFlyBird0 Dec 5, 2022
4b8437f
Merge pull request #1304 from merico-dev/fix-github-actions-file-use-…
IronCore864 Dec 5, 2022
d28d88d
Merge pull request #1303 from aFlyBird0/fix-typo-springboot
IronCore864 Dec 5, 2022
b8dad1d
docs: update air-gapped deployment document
daniel-hutao Dec 5, 2022
6f33b28
docs: add the second toolchain practice to readme document
daniel-hutao Dec 5, 2022
d0734d4
docs: udpate gitops doc
IronCore864 Dec 5, 2022
5516ead
fix: quickstart workflow failed with var ImageRepo error
daniel-hutao Dec 5, 2022
085dd88
chore: optimize log output
daniel-hutao Dec 5, 2022
2c33caf
Merge pull request #1307 from devstream-io/docs-update-gitops
daniel-hutao Dec 6, 2022
d20b848
Merge branch 'main' into docs-ht
daniel-hutao Dec 6, 2022
1ad2df9
Merge pull request #1306 from merico-dev/docs-ht
daniel-hutao Dec 6, 2022
9e04e24
docs: translate gitops
aFlyBird0 Dec 6, 2022
0e1b98f
Merge pull request #1308 from merico-dev/bugfix-ht
daniel-hutao Dec 6, 2022
3e61c6b
docs: fix typo "Argo CD"
aFlyBird0 Dec 6, 2022
136fb83
Merge pull request #1309 from aFlyBird0/docs-gitops-cn
daniel-hutao Dec 6, 2022
108630d
refactor: argocdapp support push helm config files
steinliber Dec 6, 2022
7856b96
Merge pull request #1312 from merico-dev/refactor-argocdapp-support-h…
daniel-hutao Dec 7, 2022
3de8768
docs: fix typo
aFlyBird0 Dec 7, 2022
6b13694
Merge pull request #1313 from aFlyBird0/fix-typo
daniel-hutao Dec 7, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/automated-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

2 changes: 1 addition & 1 deletion .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/update-download-script.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -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工具

Expand Down
Loading