Skip to content

Commit 8d67c63

Browse files
steinlibersteinliber
authored
Merge branch 'main' into refactor-github-actions-clean
2 parents b266231 + 0a52df8 commit 8d67c63

File tree

89 files changed

+1708
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1708
-119
lines changed

‎.github/sync-staging-repo.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
devstream-io/dtm-gitlab-share-library:
2+
- source: staging/dtm-gitlab-share-library/
3+
dest: .
4+
deleteOrphaned: true
5+
devstream-io/dtm-jenkins-share-library:
6+
- source: staging/dtm-jenkins-share-library/
7+
dest: .
8+
deleteOrphaned: true
9+
devstream-io/dtm-pipeline-templates:
10+
- source: staging/dtm-pipeline-templates/
11+
dest: .
12+
deleteOrphaned: true
13+
devstream-io/dtm-repo-scaffolding-golang:
14+
- source: staging/dtm-repo-scaffolding-golang/
15+
dest: .
16+
deleteOrphaned: true
17+
devstream-io/dtm-repo-scaffolding-golang-cli:
18+
- source: staging/dtm-repo-scaffolding-golang-cli/
19+
dest: .
20+
deleteOrphaned: true
21+
devstream-io/dtm-repo-scaffolding-golang-gin:
22+
- source: staging/dtm-repo-scaffolding-golang-gin/
23+
dest: .
24+
deleteOrphaned: true
25+
devstream-io/dtm-repo-scaffolding-java-springboot:
26+
- source: staging/dtm-repo-scaffolding-java-springboot/
27+
dest: .
28+
deleteOrphaned: true
29+
devstream-io/dtm-repo-scaffolding-python:
30+
- source: staging/dtm-repo-scaffolding-python/
31+
dest: .
32+
deleteOrphaned: true
33+
devstream-io/dtm-repo-scaffolding-python-flask:
34+
- source: staging/dtm-repo-scaffolding-python-flask/
35+
dest: .
36+
deleteOrphaned: true

‎.github/workflows/sync-staging-repo.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Sync Staging Files to Other Repos
2+
on:
3+
push:
4+
branches: [ main ]
5+
paths:
6+
- staging/**
7+
- .github/workflows/sync-staging-repo.yml
8+
- .github/sync-staging-repo.yml
9+
workflow_dispatch:
10+
11+
jobs:
12+
sync:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v3
17+
- name: Run GitHub File Sync
18+
uses: BetaHuhn/[email protected]
19+
with:
20+
GH_PAT: ${{ secrets.GH_PAT }}
21+
CONFIG_PATH: .github/sync-staging-repo.yml
22+
ORIGINAL_MESSAGE: true
23+
SKIP_PR: true
24+
COMMIT_EACH_FILE: false

‎.yamllint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ ignore: |
3232
**/.github/**
3333
**/githubactions/**
3434
**/workflows/**
35+
**/staging/**

‎docs/core-concepts/config.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ apps:
183183
scmType: github
184184
owner: devstream-io
185185
org: devstream-io # either owner or org must exist
186-
name: dtm-scaffolding-golang
186+
name: dtm-repo-scaffolding-golang
187187
url: github.com/devstream-io/repo-name # optional. if exists, no need for the scm/owner/org/name sections
188188
vars: # optional
189189
foo: bar # variables used for repoTemplate specifically
@@ -212,7 +212,7 @@ apps:
212212
repo:
213213
url: github.com/ironcore864/myapp1
214214
repoTemplate:
215-
url: github.com/devstream-io/dtm-scaffolding-python
215+
url: github.com/devstream-io/dtm-repo-scaffolding-python
216216
ci:
217217
- type: github-actions
218218
cd:
@@ -277,7 +277,7 @@ apps:
277277
repo:
278278
url: github.com/ironcore864/myapp1
279279
repoTemplate:
280-
url: github.com/devstream-io/dtm-scaffolding-python
280+
url: github.com/devstream-io/dtm-repo-scaffolding-python
281281
ci:
282282
- type: github-actions
283283
cd:

‎docs/plugins/repo-scaffolding.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ These repos are official scaffolding repo to use for `sourceRepo` config, You ca
9393

9494
| language | org | repo |
9595
|-------------|---------------|----------------------------|
96-
| Golang | devstream-io | dtm-scaffolding-golang |
97-
| Golang | devstream-io | dtm-scaffolding-golang-cli |
96+
| Golang | devstream-io | dtm-repo-scaffolding-golang |
97+
| Golang | devstream-io | dtm-repo-scaffolding-golang-cli |
9898
| Java Spring | spring-guides | gs-spring-boot |
9999

100100

@@ -113,7 +113,7 @@ tools:
113113
scmType: github
114114
sourceRepo:
115115
org: devstream-io
116-
name: dtm-scaffolding-golang
116+
name: dtm-repo-scaffolding-golang
117117
scmType: github
118118
vars:
119119
imageRepo: dtm-test/golang-repo
@@ -136,7 +136,7 @@ tools:
136136
scmType: github
137137
sourceRepo:
138138
org: devstream-io
139-
name: dtm-scaffolding-golang-cli
139+
name: dtm-repo-scaffolding-golang-cli
140140
scmType: github
141141
```
142142

‎internal/pkg/configmanager/configmanager_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ apps:
4141
scmType: github
4242
owner: devstream-io
4343
org: devstream-io # choose between owner and org
44-
name: dtm-scaffolding-golang
45-
url: github.com/devstream-io/dtm-scaffolding-golang # optional，if url is specified，we can infer scm/owner/org/name from url
44+
name: dtm-repo-scaffolding-golang
45+
url: github.com/devstream-io/dtm-repo-scaffolding-golang # optional，if url is specified，we can infer scm/owner/org/name from url
4646
ci:
4747
- type: template
4848
templateName: ci-pipeline-for-gh-actions
@@ -144,7 +144,7 @@ pipelineTemplates:
144144
},
145145
},
146146
"branch": "main",
147-
"configLocation": "https://raw.githubusercontent.com/devstream-io/ci-template/main/github-actions/workflows/main.yml",
147+
"configLocation": "https://raw.githubusercontent.com/devstream-io/dtm-pipeline-templates/main/github-actions/workflows/main.yml",
148148
},
149149
"scm": RawOptions{
150150
"apiURL": "gitlab.com/some/path/to/your/api",
@@ -199,9 +199,9 @@ pipelineTemplates:
199199
},
200200
"sourceRepo": RawOptions{
201201
"scmType": "github",
202-
"url": git.ScmURL("github.com/devstream-io/dtm-scaffolding-golang"),
202+
"url": git.ScmURL("github.com/devstream-io/dtm-repo-scaffolding-golang"),
203203
"owner": "devstream-io",
204-
"name": "dtm-scaffolding-golang",
204+
"name": "dtm-repo-scaffolding-golang",
205205
"org": "devstream-io",
206206
},
207207
"vars": RawOptions{},

‎internal/pkg/configmanager/pipelineDefault.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ type pipelineOption struct {
2323
var (
2424
// github actions pipeline options
2525
githubGeneral = pipelineOption{
26-
defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/ci-template/main/github-actions/workflows/main.yml",
26+
defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/dtm-pipeline-templates/main/github-actions/workflows/main.yml",
2727
optionGeneratorFunc: pipelineGeneralGenerator,
2828
}
2929
gitlabGeneral = pipelineOption{
30-
defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/ci-template/main/gitlab-ci/.gitlab-ci.yml",
30+
defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/dtm-pipeline-templates/main/gitlab-ci/.gitlab-ci.yml",
3131
optionGeneratorFunc: pipelineGeneralGenerator,
3232
}
3333
jenkinsGeneral = pipelineOption{
34-
defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/ci-template/main/jenkins-pipeline/general/Jenkinsfile",
34+
defaultConfigLocation: "https://raw.githubusercontent.com/devstream-io/dtm-pipeline-templates/main/jenkins-pipeline/general/Jenkinsfile",
3535
optionGeneratorFunc: jenkinsGenerator,
3636
}
3737
argocdApp = pipelineOption{

‎internal/pkg/configmanager/pipelinetemplate_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ var _ = Describe("PipelineTemplate struct", func() {
231231
Options: RawOptions{
232232
"pipeline": RawOptions{
233233
"test": "testV",
234-
"configLocation": "https://raw.githubusercontent.com/devstream-io/ci-template/main/github-actions/workflows/main.yml",
234+
"configLocation": "https://raw.githubusercontent.com/devstream-io/dtm-pipeline-templates/main/github-actions/workflows/main.yml",
235235
},
236236
"scm": RawOptions{
237237
"url": git.ScmURL(cloneURL),

‎internal/pkg/plugin/argocdapp/argocdapp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func pushArgocdConfigFiles(rawOptions configmanager.RawOptions) error {
3838
}
3939

4040
// 3. get argocd configFiles from remote
41-
const configLocation = downloader.ResourceLocation("https://github.com/devstream-io/ci-template.git//argocdapp/helm")
41+
const configLocation = downloader.ResourceLocation("https://github.com/devstream-io/dtm-pipeline-templates.git//argocdapp/helm")
4242
gitFiles, err := opts.getArgocdDefaultConfigFiles(configLocation)
4343
if err != nil {
4444
return err

‎pkg/util/jenkins/tpl/repo-casc.tpl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ unclassified:
3939
scm:
4040
git:
4141
id: "56904e9b-d14b-4932-b3b3-21bc11c2cb86"
42-
remote: "https://github.com/devstream-io/jenkins-share-library.git"
42+
remote: "https://github.com/devstream-io/dtm-jenkins-share-library.git"
4343
traits:
4444
- "gitBranchDiscovery"
4545
[[- end ]]

0 commit comments

Comments
 (0)