fix: ビルドスクリプトのバグ修正とバージョン管理の改善

cffnpwr · Jul 2, 2024 · f6156f8 · f6156f8
1 parent 8962689
commit f6156f8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,7 +4,7 @@ on:
   workflow_call:
     inputs:
       version:
-        required: false
+        required: true
         type: string
 
 jobs:
@@ -108,39 +108,34 @@ jobs:
       - name: Build
         run: cargo build --release --target ${{ matrix.job.target }}
 
-      - id: date
-        env: 
-          TZ: "Asia/Tokyo"
-        run: echo "date=unstable-$(date -u +'%Y%m%d')" >> $GITHUB_OUTPUT
-
       - name: tar archive
         id: tar
         if: ${{ !contains(matrix.job.target, 'windows') }}
         run: |
-          FILENAME=snails-machine-${{ inputs.version || steps.date.outputs.date }}-${{ matrix.job.target }}.tar.gz
+          FILENAME=snails-machine-${{ inputs.version }}-${{ matrix.job.target }}.tar.gz
           tar czf ${FILENAME} -C target/${{ matrix.job.target }}/release snails-machine
           echo "filename=${FILENAME}" >> $GITHUB_OUTPUT
       
       - name: zip archive
         id: zip
         if: contains(matrix.job.target, 'windows')
         run: |
-          $env:FILENAME="snails-machine-${{ inputs.version || steps.date.outputs.date }}-${{ matrix.job.target }}.zip"
-          Compress-Archive -Path .\\target\\${{ matrix.job.target }}\\release\\snails-machine.exe -DestinationPath $env:FILENAME
+          $env:FILENAME="snails-machine-${{ inputs.version }}-${{ matrix.job.target }}.zip"
+          Compress-Archive .\\target\\${{ matrix.job.target }}\\release\\snails-machine.exe $env:FILENAME
           echo "filename=${FILENAME}" >> $env:GITHUB_OUTPUT
 
       - name: Save tar artifact
         if: ${{ !contains(matrix.job.target, 'windows') }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.version || steps.date.outputs.date }}-${{ matrix.job.target }}
+          name: ${{ inputs.version }}-${{ matrix.job.target }}
           path: ./${{ steps.tar.outputs.filename }}
 
       - name: Save zip artifact
         if: contains(matrix.job.target, 'windows')
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.version || steps.date.outputs.date }}-${{ matrix.job.target }}
+          name: ${{ inputs.version }}-${{ matrix.job.target }}
           path: ./${{ steps.zip.outputs.filename }}
 
 

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -36,6 +36,19 @@ jobs:
 
       - name: Run Test
         run: cargo test
+
+  version:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.date.outputs.date }}
+    steps:
+      - id: date
+        env: 
+          TZ: "Asia/Tokyo"
+        run: echo "date=unstable-$(date -u +'%Y%m%d')" >> $GITHUB_OUTPUT
 
   unstable-build:
+    needs: version
     uses: ./.github/workflows/build.yaml
+    with:
+      version: ${{ needs.version.outputs.version }}