diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..4ffdcb6 --- /dev/null +++ b/.env.development @@ -0,0 +1 @@ +BASE_URL=https://dev.wafflestudio.com diff --git a/.env.production b/.env.production new file mode 100644 index 0000000..3bf8d5f --- /dev/null +++ b/.env.production @@ -0,0 +1 @@ +BASE_URL=https://wafflestudio.com diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 5514642..3145613 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -4,6 +4,10 @@ on: branches: - main +concurrency: + group: deploy-dev + cancel-in-progress: true + jobs: Deploy: runs-on: ubuntu-latest @@ -22,7 +26,7 @@ jobs: run: yarn - name: Build - run: yarn build + run: yarn build:dev - name: Upload to S3 uses: jakejarvis/s3-sync-action@master diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index c73adec..086307d 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -4,6 +4,10 @@ on: tags: - "v[0-9]+.[0-9]+.[0-9]+*" +concurrency: + group: deploy-prod + cancel-in-progress: true + jobs: Deploy: runs-on: ubuntu-latest @@ -22,7 +26,7 @@ jobs: run: yarn - name: Build - run: yarn build + run: yarn build:prod - name: Upload to S3 uses: jakejarvis/s3-sync-action@master diff --git a/app/layout.tsx b/app/layout.tsx index 8bb08b0..0258d97 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -4,6 +4,8 @@ import "../styles/globals.css"; import "../styles/font.scss"; import Header from "../components/common/Header/Header"; +const baseUrl = process.env.BASE_URL || "https://wafflestudio.com"; + export const metadata: Metadata = { title: "WaffleStudio", description: "맛있는 서비스가 탄생하는 곳 와플스튜디오", @@ -14,13 +16,13 @@ export const metadata: Metadata = { openGraph: { type: "website", locale: "ko_KR", - url: "https://wafflestudio.com", + url: baseUrl, title: "와플스튜디오", siteName: "wafflestudio.com", description: "맛있는 서비스가 탄생하는 곳 와플스튜디오", images: [ { - url: "/wafflestudio_text_logo.svg", + url: `${baseUrl}/wafflestudio_text_logo.png`, alt: "WaffleStudio", }, ], diff --git a/components/common/Header/Header.tsx b/components/common/Header/Header.tsx index a261c52..8338642 100644 --- a/components/common/Header/Header.tsx +++ b/components/common/Header/Header.tsx @@ -23,15 +23,13 @@ export default function Header() { return (