Merge branch 'main' into eng-927-fix-updater

.cargo/config.toml.mustache

@@ -0,0 +1,32 @@
+[env]
+{{#protoc}}
+PROTOC = "{{{protoc}}}"
+{{/protoc}}
+{{#ffmpeg}}
+FFMPEG_DIR = "{{{ffmpeg}}}"
+{{/ffmpeg}}
+
+{{#isMacOS}}
+[target.x86_64-apple-darwin]
+rustflags = ["-L", "{{{projectRoot}}}/target/Frameworks/lib"]
+
+[target.aarch64-apple-darwin]
+rustflags = ["-L", "{{{projectRoot}}}/target/Frameworks/lib"]
+{{/isMacOS}}
+
+{{#isWin}}
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-L", "{{{projectRoot}}}\\target\\Frameworks\\lib"]
+{{/isWin}}
+
+{{#isLinux}}
+[target.x86_64-unknown-linux-gnu]
+rustflags = ["-L", "{{{projectRoot}}}/target/Frameworks/lib"]
+
+[target.aarch64-unknown-linux-gnu]
+rustflags = ["-L", "{{{projectRoot}}}/target/Frameworks/lib"]
+{{/isLinux}}
+
+[alias]
+prisma = "run -p prisma-cli --bin prisma --"
+prisma-sync = "run -p prisma-cli --bin sync --"

.github/actions/setup-pnpm/action.yml

@@ -5,6 +5,10 @@ inputs:
     description: Github token
     required: false
     default: ''
+  ignorePostInstall:
+    description: Don't run post install
+    required: false
+    default: 'false'
 runs:
   using: 'composite'
   steps:
@@ -22,4 +26,8 @@ runs:
 
     - name: Install pnpm deps
       shell: ${{ runner.os == 'Windows' && 'powershell' || 'bash' }}
+      env:
+          NODE_ENV: debug
+          GITHUB_TOKEN: ${{ inputs.token }}
+          IGNORE_POSTINSTALL: ${{ inputs.ignorePostInstall }}
       run: pnpm i --frozen-lockfile

.github/actions/setup-rust/action.yaml

@@ -26,6 +26,10 @@ runs:
         prefix-key: 'v0-rust-deps'
         shared-key: ${{ inputs.targets }}
 
+    - name: Cargo config.toml
+      shell: bash
+      run: echo '{}' | npx -y mustache - .cargo/config.toml.mustache .cargo/config.toml
+
     - name: Restore cached Prisma codegen
       id: cache-prisma-restore
       uses: actions/cache/restore@v3

.github/actions/setup-system/action.yml

@@ -48,18 +48,18 @@ runs:
         targets: ${{ inputs.targets }}
         save-cache: ${{ inputs.save-cache }}
 
-    - name: Run 'setup-system.sh' script
+    - name: Run setup.sh script
       shell: bash
       if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }}
-      run: ./.github/scripts/setup-system.sh ${{ inputs.setup-arg }}
+      run: ./scripts/setup.sh ${{ inputs.setup-arg }}
       env:
         TARGET: ${{ inputs.targets }}
         GITHUB_TOKEN: ${{ inputs.token }}
         APPLE_SIGNING_IDENTITY: ${{ env.APPLE_SIGNING_IDENTITY }}
 
-    - name: Run 'setup-system.ps1' script
+    - name: Run setup.ps1 script
       shell: powershell
       if: ${{ runner.os == 'Windows' }}
-      run: ./.github/scripts/setup-system.ps1
+      run: ./scripts/setup.ps1
       env:
         GITHUB_TOKEN: ${{ inputs.token }}