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.

Sign up for GitHub

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

#253 [hotfix] 2023 -> 2024로 수정 #255

Merged
merged 9 commits into from
Jan 22, 2024
Merged

#253 [hotfix] 2023 -> 2024로 수정 #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6a21f41
Merge pull request #188 from ASAP-as-soon-as-possible/hotfix/#187
KWY0218 Sep 21, 2023
007eca2
Merge pull request #198 from ASAP-as-soon-as-possible/develop
KWY0218 Sep 26, 2023
4a17fe3
Merge pull request #204 from ASAP-as-soon-as-possible/hotfix/#202
sohyundoh Sep 27, 2023
863e25b
Merge pull request #211 from ASAP-as-soon-as-possible/develop
KWY0218 Sep 30, 2023
06a524b
Merge pull request #235 from ASAP-as-soon-as-possible/develop
KWY0218 Nov 3, 2023
85d161f
Merge pull request #252 from ASAP-as-soon-as-possible/develop
sohyundoh Jan 13, 2024
a3f0073
[chore] prod cd 수정
sohyundoh Jan 13, 2024
867e221
#253 [fix] 2023 -> 2024로 수정
KWY0218 Jan 22, 2024
3fc5c5b
#253 [fix] dev cd수정
KWY0218 Jan 22, 2024
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
24 changes: 12 additions & 12 deletions .github/workflows/dev-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ jobs:
- name: Upload to S3
run: aws s3 cp --region ap-northeast-2 ./asap_dev_server.zip s3://$S3_BUCKET_NAME/

# Deploy
- name: Deploy
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_KEY }}
run:
aws deploy create-deployment
--application-name asap-dev-codedeploy
--deployment-group-name asap-dev-codedeploy-group
--file-exists-behavior OVERWRITE
--s3-location bucket=asap-develop-bucket,bundleType=zip,key=asap_dev_server.zip
--region ap-northeast-2
# # Deploy
# - name: Deploy
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
# AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_KEY }}
# run:
# aws deploy create-deployment
# --application-name asap-dev-codedeploy
# --deployment-group-name asap-dev-codedeploy-group
# --file-exists-behavior OVERWRITE
# --s3-location bucket=asap-develop-bucket,bundleType=zip,key=asap_dev_server.zip
# --region ap-northeast-2
4 changes: 2 additions & 2 deletions .github/workflows/prod-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_KEY }}
run:
aws deploy create-deployment
--application-name asap-server-codedeploy
--deployment-group-name asap-server-codedeploy-group
--application-name asap-prod-code-deploy
--deployment-group-name asap-prod-server
--file-exists-behavior OVERWRITE
--s3-location bucket=asap-server,bundleType=zip,key=asap_server.zip
--region ap-northeast-2
2 changes: 1 addition & 1 deletion src/main/java/com/asap/server/common/utils/DateUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

public class DateUtil {
public static LocalDate transformLocalDate(final String month, final String day) {
return LocalDate.of(2023, Integer.parseInt(month), Integer.parseInt(day));
return LocalDate.of(2024, Integer.parseInt(month), Integer.parseInt(day));
}

public static String getMonth(final LocalDate localDate) {
Expand Down
Loading