From ee035a43b4fc6605572514d0647ece8eb4b52235 Mon Sep 17 00:00:00 2001 From: aryonuwi Date: Fri, 9 Feb 2024 10:58:54 +0700 Subject: [PATCH 1/2] update work flow --- .github/workflows/main.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1eefa2a..9cd6d52 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,15 +1,14 @@ on: - # pull_request: - # branches: - # - main - # - dev - merge_group: - push: branches: - main - dev + # pull_request: + # branches: + # - main + # - dev + # push: # branches: # - main @@ -18,7 +17,6 @@ on: name: "Build & Release" jobs: build: - name: Build & Release runs-on: windows-latest steps: - name: Checkout code From e7b069d0fb8a84aa575fbc25db0d6862f161b9dc Mon Sep 17 00:00:00 2001 From: aryonuwi Date: Fri, 9 Feb 2024 11:02:53 +0700 Subject: [PATCH 2/2] update git hub action work flow --- .github/workflows/main.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9cd6d52..36c841c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,13 +1,10 @@ on: - merge_group: + pull_request: branches: - main - dev - - # pull_request: - # branches: - # - main - # - dev + types: + - closed # push: # branches: @@ -17,6 +14,7 @@ on: name: "Build & Release" jobs: build: + if: github.event.pull_request.merged == true runs-on: windows-latest steps: - name: Checkout code