Skip to content

Commit

Permalink
Merge pull request #127 from openinfradev/release
Browse files Browse the repository at this point in the history
release -> main merge (20220808)
  • Loading branch information
ktkfree authored Aug 8, 2023
2 parents 7731033 + e655872 commit 5b4bf51
Show file tree
Hide file tree
Showing 58 changed files with 2,942 additions and 544 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
branches:
- main
- develop
- release
workflow_dispatch:

env:
SERVICE: tks-api
TAG: ${{github.sha}}
Expand Down Expand Up @@ -44,9 +47,11 @@ jobs:
if [[ ${{github.ref}} == *"develop"* ]]; then
( cd cicd-manifests/${SERVICE}/overlay/development && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
elif [[ ${{github.ref}} == *"release"* ]]; then
( cd cicd-manifests/${SERVICE}/overlay/ft && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
elif [[ ${{github.ref}} == *"main"* ]]; then
( cd cicd-manifests/${SERVICE}/overlay/cicd && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
( cd cicd-manifests/${SERVICE}/overlay/prd && kustomize edit set image docker.io/sktcloud/${SERVICE}:${TAG} && git add kustomization.yaml )
fi
cd cicd-manifests
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: Build image
name: Build Image
on:
pull_request_target:
branches:
- main
- develop
- release

env:
SERVICE: tks-api
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: golangci-lint
name: Lint
on:
push:
tags:
- v*
branches:
- main
- develop
- "release**"
- release
pull_request:
branches:
- main
- develop
- "release**"
- release
jobs:
golangci:
name: lint
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
*.njsproj
*.sln
*.sw?
*.sh

web
main
output
vendor
vendor
Loading

0 comments on commit 5b4bf51

Please sign in to comment.