fix

aspect-build · Sep 17, 2024 · 9273d9b · 9273d9b
1 parent fac4498
commit 9273d9b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -11,8 +11,8 @@ on:
         description: "Windows binaries"
         value: ${{jobs.build_windows.outputs.artifact}}
       linux:
-        description: "Linux binaries"
-        value: ${{jobs.build_windows.outputs.artifact}}
+        description: "Linux and MacOS binaries"
+        value: ${{jobs.build.outputs.artifact}}
 jobs:
   build:
     name: darwin and linux
@@ -22,15 +22,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: |
-          bazel build //:for_all_platforms
-          mv bazel-out/darwin_arm64-opt/bin/external/libarchive\~/tar/bsdtar tar_darwin_arm64
-          mv bazel-out/darwin_amd64-opt/bin/external/libarchive\~/tar/bsdtar tar_darwin_amd64
-          mv bazel-out/linux_arm64_musl-opt/bin/external/libarchive\~/tar/bsdtar tar_linux_arm64
-          mv bazel-bin/external/libarchive\~/tar/bsdtar  tar_linux_amd64
+          #bazel build //:for_all_platforms
+          #mv bazel-out/darwin_arm64-opt/bin/external/libarchive\~/tar/bsdtar tar_darwin_arm64
+          #mv bazel-out/darwin_amd64-opt/bin/external/libarchive\~/tar/bsdtar tar_darwin_amd64
+          #mv bazel-out/linux_arm64_musl-opt/bin/external/libarchive\~/tar/bsdtar tar_linux_arm64
+          #mv bazel-bin/external/libarchive\~/tar/bsdtar tar_linux_amd64
+          echo one > tar_darwin_arm64
+          echo two > tar_darwin_amd64
+          echo three > tar_linux_arm64
+          echo four > tar_linux_amd64
       - uses: actions/upload-artifact@v4
         id: upload
         with:
           name: linux
+          retention-days: 1
           path: |
             tar_darwin_arm64
             tar_darwin_amd64
@@ -44,13 +49,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: |
-          bazel build @libarchive//tar
-          mv bazel-bin/external/libarchive~/tar/bsdtar tar_windows_amd64
-      - run: |
+          #bazel build @libarchive//tar
+          #mv bazel-bin/external/libarchive~/tar/bsdtar tar_windows_amd64
+          echo five > tar_windows_amd64
+      - if: false
+        run: |
           .\tar_windows_amd64 --help
       - uses: actions/upload-artifact@v4
         id: upload
         with:
           name: windows
+          retention-days: 1
           path: |
             tar_windows_amd64
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,15 +13,17 @@ jobs:
     runs-on: ubuntu-latest
     needs: build_all
     steps:
-      - uses: actions/checkout@v3
-      - run: |
-          curl ${{ needs.build_all.outputs.linux }} -o linux.zip
-          curl ${{ needs.build_all.outputs.windows }} -o windows.zip
-          unzip linux
-          unzip windows
-          ls
-      # - uses: softprops/action-gh-release@v1
+      # Fetch the built artifacts from build jobs above and extract into
+      # ${GITHUB_WORKSPACE}/linux/*
+      # ${GITHUB_WORKSPACE}/windows/*
+      - uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+      - run: ls ${GITHUB_WORKSPACE}
+      - run: shasum -a 256 tar* > SHA256.txt
+
+      # - uses: softprops/action-gh-release@v2
       #   with:
       #     files: |
-      #       ./tar*
+      #       artifacts-*/tar*
       #       SHA256.txt