From 3d62c99aee282243bcf271e05e229d68964f9ffe Mon Sep 17 00:00:00 2001
From: Alex Freska <alex.freska@gmail.com>
Date: Tue, 30 Jan 2024 12:09:59 -0400
Subject: [PATCH] remove app param, pr action make

---
 .github/workflows/pr.yml      | 76 +++++++++++++++++++++--------------
 .github/workflows/publish.yml | 11 ++---
 2 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 968878b..726f1a5 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -55,34 +55,48 @@ jobs:
           APPLE_API_KEY_PATH: ${{ env.APPLE_API_KEY_PATH }}
         run: yarn workspace ${{ matrix.app }} make
         shell: bash
-  # windows:
-  #   strategy:
-  #     matrix:
-  #       app: [hostd, renterd]
-  #   runs-on: windows-latest
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: actions/setup-node@v3
-  #       with:
-  #         node-version: 20
-  #     - name: Setup signing
-  #       shell: bash
-  #       run: |
-  #         dotnet tool install --global AzureSignTool
-  #     - name: Install dependencies
-  #       run: |
-  #         cd ${{ matrix.app }}
-  #         npm install
-  #     - name: Build
-  #       run: |
-  #         cd ${{ matrix.app }}
-  #         npm run build
-  #     - name: Package into executable bundle
-  #       shell: bash
-  #       run: |
-  #         cd ${{ matrix.app }}
-  #         npm run make
-  #         # TODO: probably not correct
-  #         APP_PATH="out/${{ matrix.app }}-win32-x64/${{ matrix.app }}.app"
-  #         BINARY_PATH="$APP_PATH/Contents/Windows/${{ matrix.app }}.exe"
-  #         azuresigntool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v $BINARY_PATH
+  linux:
+    strategy:
+      matrix:
+        app: [hostd, renterd]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup
+        uses: ./.github/actions/setup
+        with:
+          node_version: 20.10.0
+      - name: Build
+        run: yarn workspace ${{ matrix.app }} build
+        shell: bash
+      - name: Package executable bundles, make distributables
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: yarn workspace ${{ matrix.app }} make
+        shell: bash
+  windows:
+    strategy:
+      matrix:
+        app: [hostd, renterd]
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup
+        uses: ./.github/actions/setup
+        with:
+          node_version: 20.10.0
+      - name: Setup signing
+        run: dotnet tool install --global AzureSignTool
+      - name: Build
+        run: yarn workspace ${{ matrix.app }} build
+        shell: bash
+      - name: Package executable bundles, sign and notarize, make distributables
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          yarn workspace ${{ matrix.app }} make
+          # #TODO: probably not correct
+          # APP_PATH="out/${{ matrix.app }}-win32-x64/${{ matrix.app }}.app"
+          # BINARY_PATH="$APP_PATH/Contents/Windows/${{ matrix.app }}.exe"
+          # azuresigntool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v $BINARY_PATH
+        shell: bash
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 39c9598..1f4082c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,7 +14,6 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup
         with:
-          app: ${{ matrix.app }}
           node_version: 20.10.0
       - name: Setup signing
         env:
@@ -50,7 +49,7 @@ jobs:
       - name: Build
         run: yarn workspace ${{ matrix.app }} build
         shell: bash
-      - name: Package executable bundles, sign and notarize, make distributables
+      - name: Package executable bundles, sign and notarize, make and publish distributables
         env:
           APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
           APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
@@ -68,12 +67,11 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup
         with:
-          app: ${{ matrix.app }}
           node_version: 20.10.0
       - name: Build
         run: yarn workspace ${{ matrix.app }} build
         shell: bash
-      - name: Package executable bundles, make distributables
+      - name: Package executable bundles, make and publish distributables
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: yarn workspace ${{ matrix.app }} publish
@@ -88,18 +86,17 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup
         with:
-          app: ${{ matrix.app }}
           node_version: 20.10.0
       - name: Setup signing
         run: dotnet tool install --global AzureSignTool
       - name: Build
         run: yarn workspace ${{ matrix.app }} build
         shell: bash
-      - name: Package executable bundles, sign and notarize, make distributables
+      - name: Package executable bundles, sign and notarize, make and publish distributables
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          yarn workspace ${{ matrix.app }} make
+          yarn workspace ${{ matrix.app }} publish
           # #TODO: probably not correct
           # APP_PATH="out/${{ matrix.app }}-win32-x64/${{ matrix.app }}.app"
           # BINARY_PATH="$APP_PATH/Contents/Windows/${{ matrix.app }}.exe"