Merge dev into main #536
Merged
Merge dev into main #536
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 환경, 배포 관련 문서 추가 * 최상위에서 접근경로 추가
This reverts commit 165ca87.
This reverts commit 91155d3.
* GET perfume_add englishName * Fixing GET admin/perfumes by adding englishName
* admin-imgUrl * POST admin/ingredient - create ingredient
* admin-imgUrl * POST admin/ingredient - create ingredient * perfume-addImage
upgrade android min version
* Update prebuild.sh * Update reload.sh * Create deploy file to test with Github Hosted Runner * Update deploy-development.yml using github-hosted runner and SSH * Rollback branch name to push * Remove workflow file for testing
…535) * Rollback deploy file to test with Github Hosted Runner * Update branch name to push * Add step to check default github workspace path * Add path option for actions/checkout * Delete unnecessary code * Use bash instead of sh * Get the latest changes from the branch * Manage branch name with environment variable * Use '&&' to ensure each step runs successfully * Write branch name directly * Fetch all branches from remote repository * Update reload.sh to delete duplicate code and clarify roles * Remove git reset and leave only git pull * Reflect the changes so far in deployment-development.yml * Delete the file for testing using Github Hosted Runner * Delete code for checking github workspace path * Reflect the changes so far in deployment-production-1.yml * Reflect the changes so far in deployment-production-2.yml * Reflect the changes so far in deployment-production.yml
ChoHadam
added
bug
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why:
To keep main branch up to date.
What's being changed:
package.json 수정
환경, 배포 관련 문서 추가
어드민 페이지 작업
/system/supportable엔드포인트 API 수정Android
1.5.2이상부터 true 반환되도록 수정CI/CD 성능 개선 작업