Merge branch 'main' of https://github.com/reearth/reearth-cms into fi…

…x-web/float-field
reearth · Nov 14, 2024 · 875125b · 875125b
2 parents 5ab70b4 + c580262
commit 875125b
Show file tree

Hide file tree

Showing 206 changed files with 4,080 additions and 1,629 deletions.
diff --git a/.github/workflows/build_decompressor.yml b/.github/workflows/build_decompressor.yml
@@ -29,17 +29,17 @@ jobs:
         env:
           BRANCH: ${{ github.event.workflow_run.head_branch }}
         run: |
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+          echo "sha_short=$(git rev-parse --short HEAD))" >> "$GITHUB_OUTPUT"
           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_OUTPUT"
+              echo "new_tag_short=${TAG#v}" >> "$GITHUB_OUTPUT"
             else
-              echo "::set-output name=name::rc"
+              echo "name=rc" >> "$GITHUB_OUTPUT"
             fi
           else
-            echo "::set-output name=name::nightly"
+            echo "name=nightly" >> "$GITHUB_OUTPUT"
           fi
       - name: Show info
         env:
@@ -90,9 +90,9 @@ jobs:
             VERSION=$SHA
             TAGS=$IMAGE_NAME:$NAME
           fi
-          echo "::set-output name=platforms::$PLATFORMS"
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=tags::$TAGS"
+          echo "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
       - name: Build and push docker image
         uses: docker/build-push-action@v6
         with:

diff --git a/.github/workflows/build_prepare.yml b/.github/workflows/build_prepare.yml
@@ -0,0 +1,50 @@
+on:
+  workflow_call:
+    outputs:
+      sha_short:
+        value: ${{ jobs.prepare.outputs.sha_short }}
+      new_tag:
+        value: ${{ jobs.prepare.outputs.new_tag }}
+      new_tag_short:
+        value: ${{ jobs.prepare.outputs.new_tag_short }}
+      name:
+        value: ${{ jobs.prepare.outputs.name }}
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      sha_short: ${{ steps.info.outputs.sha_short }}
+      new_tag: ${{ steps.info.outputs.new_tag }}
+      new_tag_short: ${{ steps.info.outputs.new_tag_short }}
+      name: ${{ steps.info.outputs.name }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - name: Fetch tags
+        run: git fetch --prune --unshallow --tags
+      - name: Get info
+        id: info
+        # The tag name should be retrieved lazily, as tagging may be delayed.
+        env:
+          BRANCH: ${{ github.head_ref || github.ref_name }}
+        run: |
+          echo "sha_short=$(git rev-parse --short HEAD))" >> "$GITHUB_OUTPUT"
+          if [[ "$BRANCH" = "release" ]]; then
+            TAG=$(git tag --points-at HEAD)
+            if [[ ! -z "$TAG" ]]; then
+              echo "new_tag=$TAG" >> "$GITHUB_OUTPUT"
+              echo "new_tag_short=${TAG#v}" >> "$GITHUB_OUTPUT"
+            else
+              echo "name=rc" >> "$GITHUB_OUTPUT"
+            fi
+          else
+            echo "name=nightly" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Show info
+        env:
+          SHA_SHORT: ${{ steps.info.outputs.sha_short }}
+          NEW_TAG: ${{ steps.info.outputs.new_tag }}
+          NEW_TAG_SHORT: ${{ steps.info.outputs.new_tag_short }}
+          NAME: ${{ steps.info.outputs.name }}
+        run: echo "sha_short=$SHA_SHORT, new_tag=$NEW_TAG, new_tag_short=$NEW_TAG_SHORT, name=$NAME"
diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml
@@ -1,59 +1,26 @@
-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
+  workflow_call:
+    inputs:
+      sha_short:
+        type: string
+      new_tag:
+        type: string
+      new_tag_short:
+        type: string
+      name:
+        type: string
+    secrets:
+      DOCKERHUB_USERNAME:
+        required: true
+      DOCKERHUB_TOKEN:
+        required: 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'))
-    outputs:
-      sha_short: ${{ steps.info.outputs.sha_short }}
-      new_tag: ${{ steps.info.outputs.new_tag }}
-      new_tag_short: ${{ steps.info.outputs.new_tag_short }}
-      name: ${{ steps.info.outputs.name }}
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: Fetch tags
-        run: git fetch --prune --unshallow --tags
-      - name: Get info
-        id: info
-        # The tag name should be retrieved lazily, as tagging may be delayed.
-        env:
-          BRANCH: ${{ github.head_ref || github.ref_name }}
-        run: |
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-          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}"
-            else
-                echo "::set-output name=name::rc"
-            fi
-          else
-            echo "::set-output name=name::nightly"
-          fi
-      - name: Show info
-        env:
-          SHA_SHORT: ${{ steps.info.outputs.sha_short }}
-          NEW_TAG: ${{ steps.info.outputs.new_tag }}
-          NEW_TAG_SHORT: ${{ steps.info.outputs.new_tag_short }}
-          NAME: ${{ steps.info.outputs.name }}
-        run: echo "sha_short=$SHA_SHORT, new_tag=$NEW_TAG, new_tag_short=$NEW_TAG_SHORT, name=$NAME"
-
   docker:
-    name: Build and push Docker image
     runs-on: ubuntu-latest
-    needs:
-      - info
-    if: needs.info.outputs.name || needs.info.outputs.new_tag
+    if: inputs.name || inputs.new_tag
     env:
       IMAGE_NAME: reearth/reearth-cms
     steps:
@@ -71,9 +38,9 @@ jobs:
       - name: Get options
         id: options
         env:
-          TAG: ${{ needs.info.outputs.tag_short }}
-          NAME: ${{ needs.info.outputs.name }}
-          SHA: ${{ needs.info.outputs.sha_short }}
+          TAG: ${{ inputs.new_tag_short }}
+          NAME: ${{ inputs.name }}
+          SHA: ${{ inputs.sha_short }}
         run: |
           if [[ -n $TAG ]]; then
             PLATFORMS=linux/amd64,linux/arm64
@@ -89,9 +56,9 @@ jobs:
             VERSION=$SHA
             TAGS=$IMAGE_NAME:$NAME
           fi
-          echo "::set-output name=platforms::$PLATFORMS"
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=tags::$TAGS"
+          echo "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
       - name: Fetch reearth-cms-web
         uses: dawidd6/action-download-artifact@v6
         with:

diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
@@ -1,59 +1,26 @@
-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
+  workflow_call:
+    inputs:
+      sha_short:
+        type: string
+      new_tag:
+        type: string
+      new_tag_short:
+        type: string
+      name:
+        type: string
+    secrets:
+      DOCKERHUB_USERNAME:
+        required: true
+      DOCKERHUB_TOKEN:
+        required: 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'))
-    outputs:
-      sha_short: ${{ steps.info.outputs.sha_short }}
-      new_tag: ${{ steps.info.outputs.new_tag }}
-      new_tag_short: ${{ steps.info.outputs.new_tag_short }}
-      name: ${{ steps.info.outputs.name }}
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: Fetch tags
-        run: git fetch --prune --unshallow --tags
-      - name: Get info
-        id: info
-        # The tag name should be retrieved lazily, as tagging may be delayed.
-        env:
-          BRANCH: ${{ github.event.workflow_run.head_branch }}
-        run: |
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-          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}"
-            else
-              echo "::set-output name=name::rc"
-            fi
-          else
-            echo "::set-output name=name::nightly"
-          fi
-      - name: Show info
-        env:
-          SHA_SHORT: ${{ steps.info.outputs.sha_short }}
-          NEW_TAG: ${{ steps.info.outputs.new_tag }}
-          NEW_TAG_SHORT: ${{ steps.info.outputs.new_tag_short }}
-          NAME: ${{ steps.info.outputs.name }}
-        run: echo "sha_short=$SHA_SHORT, new_tag=$NEW_TAG, new_tag_short=$NEW_TAG_SHORT, name=$NAME"
-
   docker:
-    name: Build and push Docker image
     runs-on: ubuntu-latest
-    needs:
-      - info
-    if: needs.info.outputs.name || needs.info.outputs.new_tag
+    if: inputs.name || inputs.new_tag
     env:
       IMAGE_NAME: reearth/reearth-cms-web
     steps:
@@ -71,9 +38,9 @@ jobs:
       - name: Get options
         id: options
         env:
-          TAG: ${{ needs.info.outputs.tag_short }}
-          NAME: ${{ needs.info.outputs.name }}
-          SHA: ${{ needs.info.outputs.sha_short }}
+          TAG: ${{ inputs.new_tag_short }}
+          NAME: ${{ inputs.name }}
+          SHA: ${{ inputs.sha_short }}
         run: |
           if [[ -n $TAG ]]; then
             PLATFORMS=linux/amd64,linux/arm64
@@ -89,17 +56,17 @@ jobs:
             VERSION=$SHA
             TAGS=$IMAGE_NAME:$NAME
           fi
-          echo "::set-output name=platforms::$PLATFORMS"
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=tags::$TAGS"
+          echo "platforms=$PLATFORMS" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
       - name: Build and push docker image
         uses: docker/build-push-action@v6
         with:
           context: ./web
           platforms: ${{ steps.options.outputs.platforms }}
           push: true
           build-args: |
-            GITHUB_SHA=${{ needs.info.outputs.sha_short }}
+            GITHUB_SHA=${{ inputs.sha_short }}
             VERSION=${{ steps.options.outputs.version }}
           tags: ${{ steps.options.outputs.tags }}
           cache-from: type=gha