From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Sat, 18 Nov 2023 20:59:16 +0000 (-0600)
Subject: cannot mix matrix strategy and download artifacts
X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=7a41820e4aba56ac79e31ed3dc061bf4970d6dce;p=onyx.git

cannot mix matrix strategy and download artifacts
---

diff --git a/.github/workflows/onyx-build.yml b/.github/workflows/onyx-build.yml
index b3321d01..9efa779a 100644
--- a/.github/workflows/onyx-build.yml
+++ b/.github/workflows/onyx-build.yml
@@ -133,6 +133,13 @@ jobs:
           if-no-files-found: error
           retention-days: 5
   
+  # test:
+  #   needs: [setup, build]
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Download artifacts
+
+
   release:
     needs: [setup, build]
     runs-on: ubuntu-latest
@@ -154,56 +161,58 @@ jobs:
           release_name: Release ${{ needs.setup.outputs.VERSION }}
           draft: true
           prerelease: false
-
-  release_upload:
-    needs: [setup, build, release]
-    runs-on: ubuntu-latest
-    if: needs.setup.outputs.DOING_RELEASE == '1' || github.event.inputs.release != ''
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - build: linux-amd64
-            artifact_name: 'onyx-linux-ovm-amd64'
-            asset_friendy_name: 'Linux AMD64 with OVM'
-          - build: linux-amd64
-            artifact_name: 'onyx-linux-wasmer-amd64'
-            asset_friendy_name: 'Linux AMD64 with Wasmer'
-          - build: linux-amd64
-            artifact_name: 'onyx-linux-none-amd64' 
-            asset_friendy_name: 'Linux AMD64'
-          - build: darwin-arm64
-            artifact_name: 'onyx-darwin-none-arm64'
-            asset_friendy_name: 'MacOS ARM64'
-          - build: darwin-amd64
-            artifact_name: 'onyx-darwin-none-amd64'
-            asset_friendy_name: 'MacOS AMD64'
-          # - build: darwin-arm64
-          #   os: macos-11.0
-          #   runtime_library: wasmer 
-          #   artifact_name: 'onyx-darwin-wasmer-arm64'
-          - build: windows-amd64
-            artifact_name: 'onyx-windows-wasmer-amd64'
-            asset_friendy_name: 'Windows x64'
-    steps:
-      - name: Upload Release Asset ${{ matrix.asset_friendly_name }}
-        if: ${{ matrix.build }} != 'windows-amd64'
+      - name: Upload Release Asset Linux AMD64 with OVM
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: artifacts/${{ matrix.artifact_name }}/onyx.tar.gz
-          asset_name: ${{ matrix.artifact_name }}.tar.gz
+          asset_path: artifacts/onyx-linux-ovm-amd64/onyx.tar.gz
+          asset_name: onyx-linux-ovm-amd64.tar.gz
           asset_content_type: application/gzip
-      
-      - name: Upload Release Asset ${{ matrix.asset_friendly_name }}
-        if: ${{ matrix.build }} == 'windows-amd64'
+      - name: Upload Release Asset Linux AMD64 with Wasmer
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.release.outputs.upload_url }}
+          asset_path: artifacts/onyx-linux-wasmer-amd64/onyx.tar.gz
+          asset_name: onyx-linux-wasmer-amd64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset Linux AMD64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.release.outputs.upload_url }}
+          asset_path: artifacts/onyx-linux-none-amd64/onyx.tar.gz
+          asset_name: onyx-linux-none-amd64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset MacOS AMD64
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: artifacts/${{ matrix.artifact_name }}/onyx.zip
-          asset_name: ${{ matrix.artifact_name }}.zip
+          asset_path: artifacts/onyx-darwin-none-amd64/onyx.tar.gz
+          asset_name: onyx-darwin-none-amd64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset MacOS ARM64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.release.outputs.upload_url }}
+          asset_path: artifacts/onyx-darwin-none-arm64/onyx.tar.gz
+          asset_name: onyx-darwin-none-arm64.tar.gz
+          asset_content_type: application/gzip
+      - name: Upload Release Asset Window X64
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.release.outputs.upload_url }}
+          asset_path: artifacts/onyx-windows-wasmer-amd64/onyx.zip
+          asset_name: onyx-windows-wasmer-amd64.zip
+