ci: fix wrong if, remove conrrency from build workflows

reearth · Nov 1, 2024 · 3466031 · 3466031
1 parent a680802
commit 3466031
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 22 deletions.
diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
@@ -1,17 +1,14 @@
-name: server-build
+name: build-server
 on:
   push:
     branches: [main, release]
     paths: [server/**, .github/workflows/build_server.yml]
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
-  cancel-in-progress: true
 
 jobs:
   info:
     name: Collect information
     runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion != 'failure' && github.event.repository.full_name == 'reearth/reearth-cms' && (github.event.workflow_run.head_branch == 'release' || !startsWith(github.event.head_commit.message, 'v'))
+    if: github.event.repository.full_name == 'reearth/reearth-cms' && (github.ref_name == 'release' || !startsWith(github.event.head_commit.message, 'v'))
     outputs:
       sha_short: ${{ steps.info.outputs.sha_short }}
       new_tag: ${{ steps.info.outputs.new_tag }}
@@ -71,7 +68,7 @@ jobs:
       - name: Get options
         id: options
         env:
-          TAG: ${{ needs.info.outputs.tag_short }}
+          TAG: ${{ needs.info.outputs.new_tag_short }}
           NAME: ${{ needs.info.outputs.name }}
           SHA: ${{ needs.info.outputs.sha_short }}
         run: |

diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
@@ -1,17 +1,14 @@
-name: web-build
+name: build-web
 on:
   push:
     branches: [ main, release ]
     paths: [ web/**, .github/workflows/build_web.yml ]
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
-  cancel-in-progress: true
 
 jobs:
   info:
     name: Collect information
     runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion != 'failure' && github.event.repository.full_name == 'reearth/reearth-cms' && (github.event.workflow_run.head_branch == 'release' || !startsWith(github.event.head_commit.message, 'v'))
+    if: github.event.repository.full_name == 'reearth/reearth-cms' && (github.ref_name == 'release' || !startsWith(github.event.head_commit.message, 'v'))
     outputs:
       sha_short: ${{ steps.info.outputs.sha_short }}
       new_tag: ${{ steps.info.outputs.new_tag }}
@@ -32,13 +29,13 @@ jobs:
           if [[ "$BRANCH" = "release" ]]; then
             TAG=$(git tag --points-at HEAD)
             if [[ ! -z "$TAG" ]]; then
-              echo "::set-output name=new_tag::$TAG"
-              echo "::set-output name=new_tag_short::${TAG#v}"
+              echo "new_tag=$TAG" >> $GITHUB_ENV
+              echo "new_tag_short=${TAG#v}" >> $GITHUB_ENV
             else
-              echo "::set-output name=name::rc"
+              echo "name=rc" >> $GITHUB_ENV
             fi
           else
-            echo "::set-output name=name::nightly"
+            echo "name=nightly" >> $GITHUB_ENV
           fi
       - name: Show info
         env:
@@ -71,7 +68,7 @@ jobs:
       - name: Get options
         id: options
         env:
-          TAG: ${{ needs.info.outputs.tag_short }}
+          TAG: ${{ needs.info.outputs.new_tag_short }}
           NAME: ${{ needs.info.outputs.name }}
           SHA: ${{ needs.info.outputs.sha_short }}
         run: |

diff --git a/.github/workflows/build_worker.yml b/.github/workflows/build_worker.yml
@@ -1,17 +1,14 @@
-name: worker-build
+name: build-worker
 on:
   push:
     branches: [main, release]
     paths: [worker/**, .github/workflows/build_worker.yml]
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
-  cancel-in-progress: true
 
 jobs:
   info:
     name: Collect information
     runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion != 'failure' && github.event.repository.full_name == 'reearth/reearth-cms' && (github.event.workflow_run.head_branch == 'release' || !startsWith(github.event.head_commit.message, 'v'))
+    if: github.event.repository.full_name == 'reearth/reearth-cms' && (github.ref_name == 'release' || !startsWith(github.event.head_commit.message, 'v'))
     outputs:
       sha_short: ${{ steps.info.outputs.sha_short }}
       new_tag: ${{ steps.info.outputs.new_tag }}
@@ -71,7 +68,7 @@ jobs:
       - name: Get options
         id: options
         env:
-          TAG: ${{ needs.info.outputs.tag_short }}
+          TAG: ${{ needs.info.outputs.new_tag_short }}
           NAME: ${{ needs.info.outputs.name }}
           SHA: ${{ needs.info.outputs.sha_short }}
         run: |