Skip to content

Commit

Permalink
chore(cd): cd 테스트
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobhboy committed Apr 18, 2024
1 parent 977a85f commit 8b9d703
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
run: ./gradlew clean build

deploy:
needs: integration
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
Expand All @@ -40,7 +41,7 @@ jobs:
- 'logging-server/**'
- name: deploy main-server
if: steps.changes.outputs.front == 'true'
if: steps.changes.outputs.main == 'true'
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.SERVER_HOST }}
Expand All @@ -52,7 +53,7 @@ jobs:
sh ~/script/deploy-main-server.sh
- name: deploy logging-server
if: steps.changes.outputs.back == 'true'
if: steps.changes.outputs.logging == 'true'
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.SERVER_HOST }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,14 @@ public class CorsConfig implements WebMvcConfigurer {
private static final String ALLOWED_METHODS = "*";
private static final String MAIN_SERVER_DOMAIN = "https://sickgyun.com";
private static final String FRONTEND_LOCALHOST = "http://localhost:3000";
private static final String HTTPS_FRONTEND_LOCALHOST = "https://localhost:3000";

@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping(ALLOW_ALL_PATH)
.allowedMethods(ALLOWED_METHODS)
.allowedOrigins(
MAIN_SERVER_DOMAIN,
FRONTEND_LOCALHOST,
HTTPS_FRONTEND_LOCALHOST
FRONTEND_LOCALHOST
)
.allowCredentials(true)
.exposedHeaders(LOCATION, SET_COOKIE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
private static final String ALLOWED_METHODS = "*";
private static final String MAIN_SERVER_DOMAIN = "https://sickgyun.com";
private static final String FRONTEND_LOCALHOST = "http://localhost:3000";
private static final String HTTPS_FRONTEND_LOCALHOST = "https://localhost:3000";

private final JwtParser jwtParser;
private final AuthUpdater authUpdater;
Expand All @@ -36,8 +35,7 @@ public void addCorsMappings(CorsRegistry registry) {
.allowedMethods(ALLOWED_METHODS)
.allowedOrigins(
MAIN_SERVER_DOMAIN,
FRONTEND_LOCALHOST,
HTTPS_FRONTEND_LOCALHOST
FRONTEND_LOCALHOST
)
.allowCredentials(true)
.exposedHeaders(LOCATION, SET_COOKIE);
Expand Down

0 comments on commit 8b9d703

Please sign in to comment.