Fix ci

crystal-china · Oct 27, 2024 · d6762b1 · d6762b1
1 parent 6a07171
commit d6762b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/alpine_x86_64_release.yml b/.github/workflows/alpine_x86_64_release.yml
@@ -27,14 +27,13 @@ jobs:
         run: crystal spec --order=random --error-on-warnings
       - name: package information
         run: |
-          echo "BINARY_NAME=bin/procodile" >> $GITHUB_ENV
+          echo "BINARY_NAME=bin/$(cat shard.yml |grep targets -A1|tail -n1 |sed 's#[ :]##g')" >> $GITHUB_ENV
           echo "PKG_ARCH=x86_64" >> $GITHUB_ENV
-          echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
           echo "PLATFORM=unknown-linux-musl.tar.gz" >> $GITHUB_ENV
           echo "BUILD_ARGS=--static --link-flags=\"-s -Wl,-z,relro,-z,now\"" >> $GITHUB_ENV
       - name: set asset name
         run: |
-          echo "ASSERT_NAME=${{env.BINARY_NAME}}-${{env.RELEASE_VERSION}}-${{env.PKG_ARCH}}-${{env.PLATFORM}}" >> $GITHUB_ENV
+          echo "ASSERT_NAME=${{env.BINARY_NAME}}-${{github.ref_name}}-${{env.PKG_ARCH}}-${{env.PLATFORM}}" >> $GITHUB_ENV
       - name: release binary
         id: release
         run: |

diff --git a/.github/workflows/apple_darwin_release.yml → .github/workflows/macos_release.yml b/.github/workflows/apple_darwin_release.yml → .github/workflows/macos_release.yml
@@ -27,14 +27,13 @@ jobs:
         run: crystal spec --order=random --error-on-warnings
       - name: package information
         run: |
-          echo "BINARY_NAME=bin/procodile" >> $GITHUB_ENV
+          echo "BINARY_NAME=bin/$(cat shard.yml |grep targets -A1|tail -n1 |sed 's#[ :]##g')" >> $GITHUB_ENV
           echo "PKG_ARCH=x86_64" >> $GITHUB_ENV
-          echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
           echo "PLATFORM=apple-darwin.tar.gz" >> $GITHUB_ENV
           echo "BUILD_ARGS=" >> $GITHUB_ENV
       - name: set asset name
         run: |
-          echo "ASSERT_NAME=${{env.BINARY_NAME}}-${{env.RELEASE_VERSION}}-${{env.PKG_ARCH}}-${{env.PLATFORM}}" >> $GITHUB_ENV
+          echo "ASSERT_NAME=${{env.BINARY_NAME}}-${{github.ref_name}}-${{env.PKG_ARCH}}-${{env.PLATFORM}}" >> $GITHUB_ENV
       - name: release binary
         id: release
         run: |