ehhhhh

zoidyzoidzoid · Mar 30, 2021 · 8f09381 · 8f09381
1 parent 26eab36
commit 8f09381
Showing 1 changed file with 21 additions and 47 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,82 +21,56 @@ jobs:
     steps:
       - name: checkout code
         uses: actions/checkout@v2
+      - name: get release version
+        id: release_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
+      - name: get arch asset name
+        id: arch
+        run: |
+          ARCH=${{ matrix.platform }}
+          echo ::set-output name=ARCH::${ARCH/linux_//}
       - name: build
         run: |
           set -eu
           wget https://github.com/bazelbuild/bazelisk/releases/download/v1.7.5/bazelisk-linux-amd64
           chmod +x bazelisk-linux-amd64
           ./bazelisk-linux-amd64 build --platforms=@io_bazel_rules_go//go/toolchain:${{ matrix.platform }} //container/go/cmd/puller:puller //container/go/cmd/loader:loader
-          ./bazelisk-linux-amd64 run --run_under "cp -f " //container/go/cmd/puller:puller $(pwd)/puller
-          ./bazelisk-linux-amd64 run --run_under "cp -f " //container/go/cmd/loader:loader $(pwd)/loader
+          ./bazelisk-linux-amd64 run --run_under "cp -f " //container/go/cmd/puller:puller $(pwd)/puller-lnux-${{ steps.release_version.outputs.VERSION }}-${{ steps.arch.outputs.ARCH }}
+          ./bazelisk-linux-amd64 run --run_under "cp -f " //container/go/cmd/loader:loader $(pwd)/loader-lnux-${{ steps.release_version.outputs.VERSION }}-${{ steps.arch.outputs.ARCH }}
       - name: get release URL
         id: get_release
         uses: bruceadams/get-release@v1.2.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: get release version
-        id: release_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
-      - name: upload puller
-        id: upload-release-asset-puller
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: puller
-          asset_name: puller-${{ steps.release_version.outputs.VERSION }}-linux-x86_64
-          asset_content_type: application/octet-stream
-      - name: upload loader
-        id: upload-release-asset-loader
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: loader
-          asset_name: loader-${{ steps.release_version.outputs.VERSION }}-linux-x86_64
-          asset_content_type: application/octet-stream
 
   mac:
     name: create mac binary
     runs-on: macos-10.15
     steps:
       - name: checkout
         uses: actions/checkout@v2
+      - name: get release version
+        id: release_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
       - name: build
         run: |
           set -eu
           wget https://github.com/bazelbuild/bazelisk/releases/download/v1.7.5/bazelisk-darwin-amd64
           chmod +x bazelisk-darwin-amd64
           ./bazelisk-darwin-amd64 build --platforms=@io_bazel_rules_go//go/toolchain:darwin_amd64 //container/go/cmd/puller:puller //container/go/cmd/loader:loader
-          ./bazelisk-darwin-amd64 run --run_under "cp -f " //container/go/cmd/puller:puller $(pwd)/puller
-          ./bazelisk-darwin-amd64 run --run_under "cp -f " //container/go/cmd/loader:loader $(pwd)/loader
+          ./bazelisk-darwin-amd64 run --run_under "cp -f " //container/go/cmd/puller:puller $(pwd)/puller-darwin-${{ steps.release_version.outputs.VERSION }}-x86_64
+          ./bazelisk-darwin-amd64 run --run_under "cp -f " //container/go/cmd/loader:loader $(pwd)/loader-darwin-${{ steps.release_version.outputs.VERSION }}-x86_64
       - name: get release URL
         id: get_release
         uses: bruceadams/get-release@v1.2.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: get release version
-        id: release_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
-      - name: upload puller
-        id: upload-release-asset-puller
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: upload
+        uses: softprops/action-gh-release@v1
+        # if: startsWith(github.ref, 'refs/tags/')
         with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: puller
-          asset_name: puller-${{ steps.release_version.outputs.VERSION }}-darwin-x86_64
-          asset_content_type: application/octet-stream
-      - name: upload loader
-        id: upload-release-asset-loader
-        uses: actions/upload-release-asset@v1
+          files: |
+          puller-darwin-${{ steps.release_version.outputs.VERSION }}-x86_64
+          loader-darwin-${{ steps.release_version.outputs.VERSION }}-x86_64
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: loader
-          asset_name: loader-${{ steps.release_version.outputs.VERSION }}-darwin-x86_64
-          asset_content_type: application/octet-stream