Merge branch 'main' into PR

filips123 · Mar 30, 2024 · 44d24d1 · 44d24d1
2 parents eedbb46 + bafbe80
commit 44d24d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/extension.yaml b/.github/workflows/extension.yaml
@@ -41,7 +41,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Install dependencies
         run: yarn install --frozen-lockfile
@@ -70,10 +70,10 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile
 
       - name: Set the version
         run: |
@@ -89,7 +89,7 @@ jobs:
 
       - name: Upload artifacts
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: extension/dist/*.zip
 

diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml
@@ -49,6 +49,7 @@ jobs:
           toolchain: stable
           components: clippy
           cache: false
+          rustflags: ""
 
       - name: Configure cache
         uses: Swatinem/rust-cache@v2
@@ -80,6 +81,7 @@ jobs:
           toolchain: nightly
           components: rustfmt
           cache: false
+          rustflags: ""
 
       - name: Configure cache
         uses: Swatinem/rust-cache@v2
@@ -138,6 +140,7 @@ jobs:
           toolchain: stable
           target: ${{ matrix.target }}
           cache: false
+          rustflags: ""
 
       - name: Configure cache
         uses: Swatinem/rust-cache@v2
@@ -154,7 +157,7 @@ jobs:
         run: |
           # Use cross 0.2.4 for now because newer versions require too new glibc versions
           # In the future, we should update cross and configure zig to link to older glibc
-          cargo install cross --git https://github.com/cross-rs/cross --rev 4645d937bdae6952d9df38eff3ecb91fd719c3bd
+          cargo install cross --git https://github.com/cross-rs/cross.git --rev 4645d937bdae6952d9df38eff3ecb91fd719c3bd
 
       - name: Install Cargo DEB (Linux)
         if: matrix.os == 'ubuntu-latest'