ci: merge staging to master

.gitlab-ci.yml

@@ -140,6 +140,7 @@ build:linux:
   variables:
     # Only x64 architecture is needed
     npm_config_arch: "x64"
+    RUST_BACKTRACE: "1"
   script:
     - >
       nix-shell --arg ci true --run $'
@@ -168,18 +169,20 @@ build:linux:
 build:windows:
   stage: build
   needs: []
+  allow_failure: true
   tags:
     - windows
   variables:
     # Only x64 architecture is needed
     npm_config_arch: "x64"
+    RUST_BACKTRACE: "1"
   before_script:
     - mkdir -Force "$CI_PROJECT_DIR/tmp"
   script:
     - ./scripts/choco-install.ps1
     - refreshenv
     - npm install --ignore-scripts
-    - $env:Path = "$(npm bin);" + $env:Path
+    - $env:Path = "$(npm root)\.bin;" + $env:Path
     - npm run prebuild --verbose -- --production
     - npm test -- --ci --coverage
     - npm run bench
@@ -208,14 +211,19 @@ build:macos:
   image: macos-11-xcode-12
   variables:
     # Produce universal binary
-    npm_config_arch: 'x64+arm64'
+    RUST_BACKTRACE: "1"
   script:
     - eval "$(brew shellenv)"
     - ./scripts/brew-install.sh
     - hash -r
     - npm install --ignore-scripts
-    - export PATH="$(npm bin):$PATH"
-    - npm run prebuild --verbose -- --production
+    - export PATH="$(npm root)/.bin:$PATH"
+    # Gitlab MacOS already has rust installed
+    # This will override the system installed rust
+    - export PATH="$HOME/.cargo/bin:$PATH"
+    # Build x64 and arm64 separately
+    - npm run prebuild --verbose -- --arch x64 --production
+    - npm run prebuild --verbose -- --arch arm64 --production
     - npm test -- --ci --coverage
     - npm run bench
   artifacts:
@@ -240,7 +248,7 @@ build:prerelease:
   needs:
     - build:dist
     - build:linux
-    - build:windows
+#    - build:windows
     - build:macos
   # Don't interrupt publishing job
   interruptible: false
@@ -325,7 +333,7 @@ release:distribution:
   needs:
     - build:dist
     - build:linux
-    - build:windows
+#    - build:windows
     - build:macos
     - integration:merge
   # Don't interrupt publishing job