fix: updated workflows with correct syntax and os-specific paths (#174)

* fix: updated workflows with correct syntax and os-specific paths

* fix: cache syntax

Author: FinsaasGH

.github/workflows/ci-matrix.yml

@@ -13,26 +13,24 @@ jobs:
       matrix:
         target:
           - { name: linux, os: ubuntu-latest }
-          - { name: macos, os: macos-latest }
+          - { name: macos, os: macOS-latest }
           - { name: windows, os: windows-latest }
 
     name: Build node on ${{ matrix.target.os }}
     runs-on: ${{ matrix.target.os }}
     steps:
       - uses: actions/checkout@v3
-      - name: Cache sccache results
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-node-modules
+      - uses: actions/cache@v3
         with:
           path: |
-            ~/.cargo/cache/
             ~/.cargo/bin/
+            ~/.cargo/cache/
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.OS }}-cargo-
       - name: Build ${{ matrix.target.os }}
         run: |
           rustup check

.github/workflows/s3-release.yml

@@ -21,7 +21,7 @@ jobs:
             GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         - name: Display structure of downloaded files
           run: ls -R download
-        - name: S3 Sync
+        - name: Linux S3 Sync
           uses: jakejarvis/[email protected]
           with:
            args: --acl private --follow-symlinks --delete
@@ -30,8 +30,38 @@ jobs:
             AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
             AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
             AWS_REGION: 'us-west-2'
-            DEST_DIR: 'Node/${{ github.head_ref }}'
-            SOURCE_DIR: download
+            DEST_DIR: 'Node/${{ github.event.workflow_run.head_branch }}/Node-linux'
+            SOURCE_DIR: 'download/Node-linux/generated/bin/'
+        - name: Windows S3 Sync
+          uses: jakejarvis/[email protected]
+          with:
+           args: --acl private --follow-symlinks --delete
+          env:
+            AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+            AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+            AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            AWS_REGION: 'us-west-2'
+            DEST_DIR: 'Node/${{ github.event.workflow_run.head_branch }}/Node-windows'
+            SOURCE_DIR: 'download/Node-windows/generated/bin/'
+        - name: MacOS S3 Sync
+          uses: jakejarvis/[email protected]
+          with:
+           args: --acl private --follow-symlinks --delete
+          env:
+            AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+            AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+            AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            AWS_REGION: 'us-west-2'
+            DEST_DIR: 'Node/${{ github.event.workflow_run.head_branch }}/Node-macos'
+            SOURCE_DIR: 'download/Node-macos/generated/bin/'
+        - name: Invalidate Binaries CloudFront
+          uses: chetan/[email protected]
+          env:
+            DISTRIBUTION: ${{ secrets.DISTRIBUTION }}
+            PATHS: "/Node*"
+            AWS_REGION: "us-west-2"
+            AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+            AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   deploy_to_latest_s3:
        if: startsWith(github.head_ref, 'v*') == true
@@ -47,7 +77,29 @@ jobs:
             GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         - name: Display structure of downloaded files
           run: ls -R download
-        - name: S3 Sync
+        - name: Linux S3 Sync
+          uses: jakejarvis/[email protected]
+          with:
+           args: --acl private --follow-symlinks --delete
+          env:
+            AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+            AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+            AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            AWS_REGION: 'us-west-2'
+            DEST_DIR: 'Node/latest/Node-linux'
+            SOURCE_DIR: 'download/Node-linux/generated/bin/'
+        - name: Windows S3 Sync
+          uses: jakejarvis/[email protected]
+          with:
+           args: --acl private --follow-symlinks --delete
+          env:
+            AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+            AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+            AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            AWS_REGION: 'us-west-2'
+            DEST_DIR: 'Node/latest/Node-windows'
+            SOURCE_DIR: 'download/Node-windows/generated/bin/'
+        - name: MacOS S3 Sync
           uses: jakejarvis/[email protected]
           with:
            args: --acl private --follow-symlinks --delete
@@ -56,13 +108,13 @@ jobs:
             AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
             AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
             AWS_REGION: 'us-west-2'
-            DEST_DIR: 'Node/latest'
-            SOURCE_DIR: download
+            DEST_DIR: 'Node/latest/Node-macos'
+            SOURCE_DIR: 'download/Node-macos/generated/bin/'
         - name: Invalidate Binaries CloudFront
           uses: chetan/[email protected]
           env:
             DISTRIBUTION: ${{ secrets.DISTRIBUTION }}
             PATHS: "/Node*"
             AWS_REGION: "us-west-2"
             AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-            AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}    
+            AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}