From 7a457cf4847eda98beafa522e029d28be739b36f Mon Sep 17 00:00:00 2001 From: Pugma Date: Wed, 16 Oct 2024 01:02:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?main=20=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81?= =?UTF-8?q?=E3=81=B8=E3=81=AE=E5=90=8D=E7=A7=B0=E5=A4=89=E6=9B=B4=E3=81=AB?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml | 2 +- .github/workflows/staging.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3523543..3d72454 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - 'master' + - 'main' pull_request: jobs: diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index bb375a0..2b7d4ec 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1,9 +1,9 @@ -name: Build image (master) +name: Build image (main) on: push: branches: - - master + - main env: IMAGE_NAME: traportfolio-ui From 56a792aa6d0268dd57e0082c09b7ceaa0d608177 Mon Sep 17 00:00:00 2001 From: Pugma Date: Wed, 16 Oct 2024 10:45:41 +0900 Subject: [PATCH 2/2] =?UTF-8?q?staging=20=E7=94=A8=20image=20=E3=82=BF?= =?UTF-8?q?=E3=82=B0=E3=82=82=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 2b7d4ec..0120b73 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -7,7 +7,7 @@ on: env: IMAGE_NAME: traportfolio-ui - IMAGE_TAG: master + IMAGE_TAG: main jobs: genApi: