Skip to content

Commit ebdbcbe

Browse files
committed
rebase to origin
1 parent 15dfa33 commit ebdbcbe

File tree

2 files changed

+25
-23
lines changed

2 files changed

+25
-23
lines changed

.github/workflows/gradle.yml

+23-23
Original file line numberDiff line numberDiff line change
@@ -91,27 +91,27 @@ jobs:
9191
# codedeploy-application: demo_app
9292
# codedeploy-deployment-group: demo_app
9393

94-
- name: Checkout k8s-env
95-
uses: actions/checkout@v4
96-
with:
97-
token: ${{ secrets.INFRA_GITHUB_TOKEN }}
98-
repository: DevopsArtFactory/k8s-chart-value
99-
ref: main
94+
# - name: Checkout k8s-env
95+
# uses: actions/checkout@v4
96+
# with:
97+
# token: ${{ secrets.INFRA_GITHUB_TOKEN }}
98+
# repository: DevopsArtFactory/k8s-chart-value
99+
# ref: main
100100

101-
- name: Change Image tag
102-
run: |
103-
sed -i '/^/s/tag:.*/tag: d${{ steps.vars.outputs.sha_short }}/' ./${CLUSTER_NAME}/${APP_NAME}/image.yaml
104-
ls
105-
shell: bash
106-
107-
- name: GIT commit and push docs
108-
env:
109-
CI_COMMIT_MESSAGE: Update Tag - d${{ steps.vars.outputs.sha_short }}
110-
CI_COMMIT_AUTHOR: zerone
111-
run: |
112-
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
113-
git config --global user.email "[email protected]"
114-
git status
115-
git add -A
116-
git commit -m "${{ env.CI_COMMIT_MESSAGE }}"
117-
git push origin main
101+
# - name: Change Image tag
102+
# run: |
103+
# sed -i '/^/s/tag:.*/tag: d${{ steps.vars.outputs.sha_short }}/' ./${CLUSTER_NAME}/${APP_NAME}/image.yaml
104+
# ls
105+
# shell: bash
106+
107+
# - name: GIT commit and push docs
108+
# env:
109+
# CI_COMMIT_MESSAGE: Update Tag - d${{ steps.vars.outputs.sha_short }}
110+
# CI_COMMIT_AUTHOR: zerone
111+
# run: |
112+
# git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
113+
# git config --global user.email "[email protected]"
114+
# git status
115+
# git add -A
116+
# git commit -m "${{ env.CI_COMMIT_MESSAGE }}"
117+
# git push origin main

src/main/java/com/example/demo/api/sample/controller/SampleController.java

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public String getValue() {
3434
StringBuilder returnMsg = new StringBuilder();
3535
returnMsg.append("ID :");
3636
returnMsg.append(sampleId);
37+
returnMsg.append("Password :");
38+
returnMsg.append(samplePassword);
3739
return returnMsg.toString();
3840
}
3941
}

0 commit comments

Comments
 (0)