From d139b0977e73ee0d7d05ae3656df1b1a323f36df Mon Sep 17 00:00:00 2001 From: Donghyeon Im Date: Wed, 8 May 2024 14:12:25 +0900 Subject: [PATCH 1/6] fix(.github/workflows/aws.yaml): modify 'Push commit' --- .github/workflows/aws.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/aws.yaml b/.github/workflows/aws.yaml index 45ba682..ef2bc06 100644 --- a/.github/workflows/aws.yaml +++ b/.github/workflows/aws.yaml @@ -86,4 +86,5 @@ jobs: uses: ad-m/github-push-action@master with: github_token: ${{ secrets.PAT }} - repository: NTF-marketplace/devops \ No newline at end of file + repository: NTF-marketplace/devops + branch: develop \ No newline at end of file From 62f52db890a4969778213768d514642ebe6be801 Mon Sep 17 00:00:00 2001 From: Donghyeon Im Date: Wed, 8 May 2024 14:13:11 +0900 Subject: [PATCH 2/6] fix(.github/workflows/aws.yaml): modify action trigger for test --- .github/workflows/aws.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/aws.yaml b/.github/workflows/aws.yaml index ef2bc06..37ee841 100644 --- a/.github/workflows/aws.yaml +++ b/.github/workflows/aws.yaml @@ -5,6 +5,7 @@ on: branches: - main - develop + - fix/github-action jobs: build: From 59c5906c5b0db73e671a13d2aced8d79c69f7dd0 Mon Sep 17 00:00:00 2001 From: Donghyeon Im Date: Wed, 8 May 2024 14:17:12 +0900 Subject: [PATCH 3/6] fix(.github/workflows/aws.yaml): modify 'Determin ECR Repository' --- .github/workflows/aws.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws.yaml b/.github/workflows/aws.yaml index 37ee841..2e61f05 100644 --- a/.github/workflows/aws.yaml +++ b/.github/workflows/aws.yaml @@ -28,7 +28,7 @@ jobs: - name: Determine ECR Repository id: ecr_repo run: | - REPO_NAME=$(echo ${{ github.repository }} | awk -F '/' '{print $2}' | tr '[:upper:]' '[:lower:]') + REPO_NAME="fix/github-action" echo "repo=${REPO_NAME}" >> $GITHUB_OUTPUT From 4a381bebfad1c8b63db646b3bdf56c0e94a13792 Mon Sep 17 00:00:00 2001 From: Donghyeon Im Date: Wed, 8 May 2024 14:21:06 +0900 Subject: [PATCH 4/6] fix(.github/workflows/aws.yaml): modify 'Determine ECR Repository' --- .github/workflows/aws.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/aws.yaml b/.github/workflows/aws.yaml index 2e61f05..d2ffe44 100644 --- a/.github/workflows/aws.yaml +++ b/.github/workflows/aws.yaml @@ -37,8 +37,7 @@ jobs: elif [[ "${{ github.ref }}" == "refs/heads/develop" ]]; then echo "environment=stag" >> $GITHUB_OUTPUT else - echo "::error::Unsupported branch: ${{ github.event_name }} on ${{ github.ref }}" - exit 1 + echo "environment=stag" >> $GITHUB_OUTPUT fi - name: Configure AWS credentials From 75089075c2fa1faba4b864ace4c769c2202c0417 Mon Sep 17 00:00:00 2001 From: Donghyeon Im Date: Wed, 8 May 2024 14:25:48 +0900 Subject: [PATCH 5/6] fix(.github/workflows/aws.yaml): modify 'Determine ECR Repository' --- .github/workflows/aws.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws.yaml b/.github/workflows/aws.yaml index d2ffe44..1ca638b 100644 --- a/.github/workflows/aws.yaml +++ b/.github/workflows/aws.yaml @@ -28,7 +28,7 @@ jobs: - name: Determine ECR Repository id: ecr_repo run: | - REPO_NAME="fix/github-action" + REPO_NAME="auth" echo "repo=${REPO_NAME}" >> $GITHUB_OUTPUT From ab0fba0147ee281063def16d532c8d4153803339 Mon Sep 17 00:00:00 2001 From: Donghyeon Im Date: Wed, 8 May 2024 14:29:19 +0900 Subject: [PATCH 6/6] fix(.github/workflows/aws.yaml): recover test code --- .github/workflows/aws.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/aws.yaml b/.github/workflows/aws.yaml index 1ca638b..ef2bc06 100644 --- a/.github/workflows/aws.yaml +++ b/.github/workflows/aws.yaml @@ -5,7 +5,6 @@ on: branches: - main - develop - - fix/github-action jobs: build: @@ -28,7 +27,7 @@ jobs: - name: Determine ECR Repository id: ecr_repo run: | - REPO_NAME="auth" + REPO_NAME=$(echo ${{ github.repository }} | awk -F '/' '{print $2}' | tr '[:upper:]' '[:lower:]') echo "repo=${REPO_NAME}" >> $GITHUB_OUTPUT @@ -37,7 +36,8 @@ jobs: elif [[ "${{ github.ref }}" == "refs/heads/develop" ]]; then echo "environment=stag" >> $GITHUB_OUTPUT else - echo "environment=stag" >> $GITHUB_OUTPUT + echo "::error::Unsupported branch: ${{ github.event_name }} on ${{ github.ref }}" + exit 1 fi - name: Configure AWS credentials