summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2025-05-14 14:31:56 +0200
committerDavid Lönnhager <david.l@mullvad.net>2025-05-14 14:31:56 +0200
commit47d6d30e2263b8a644b88e10f3cda5edfbe6bff4 (patch)
tree8c9e7ddc0450b53b2615a60adaa27af81d284062
parent87ea9fdb1d7a76b0f5b234def156bb9a31ee3b83 (diff)
parente49ad034d9481ab1a75179917bb8ad744a044d9e (diff)
downloadmullvadvpn-47d6d30e2263b8a644b88e10f3cda5edfbe6bff4.tar.xz
mullvadvpn-47d6d30e2263b8a644b88e10f3cda5edfbe6bff4.zip
Merge branch 'fix-flaky-ci'
-rw-r--r--.github/workflows/clippy.yml4
-rw-r--r--.github/workflows/rustfmt.yml4
-rw-r--r--.github/workflows/testframework-clippy.yml8
-rw-r--r--.github/workflows/testframework-rustfmt.yml4
4 files changed, 20 insertions, 0 deletions
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index cacb0236cb..758610501b 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -71,6 +71,10 @@ jobs:
with:
go-version: 1.21.3
+ - name: Install Rust components
+ shell: bash
+ run: rustup component add clippy
+
- name: Clippy check
shell: bash
env:
diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml
index 54c39aaf3e..381280c2c4 100644
--- a/.github/workflows/rustfmt.yml
+++ b/.github/workflows/rustfmt.yml
@@ -20,6 +20,10 @@ jobs:
- name: Checkout wireguard-go submodule
run: git submodule update --init --depth=1 wireguard-go-rs
+ - name: Install Rust components
+ shell: bash
+ run: rustup component add rustfmt
+
- name: Check formatting
run: |-
rustfmt --version
diff --git a/.github/workflows/testframework-clippy.yml b/.github/workflows/testframework-clippy.yml
index 9a5040d882..d5125f4fc9 100644
--- a/.github/workflows/testframework-clippy.yml
+++ b/.github/workflows/testframework-clippy.yml
@@ -34,6 +34,10 @@ jobs:
sudo apt-get update
sudo apt-get install libdbus-1-dev
+ - name: Install Rust components
+ shell: bash
+ run: rustup component add clippy
+
- name: Clippy check
working-directory: test
shell: bash
@@ -55,6 +59,10 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
+ - name: Install Rust components
+ shell: bash
+ run: rustup component add clippy
+
- name: Clippy check
working-directory: test
shell: bash
diff --git a/.github/workflows/testframework-rustfmt.yml b/.github/workflows/testframework-rustfmt.yml
index a21d86f694..f7ee47d661 100644
--- a/.github/workflows/testframework-rustfmt.yml
+++ b/.github/workflows/testframework-rustfmt.yml
@@ -18,6 +18,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
+ - name: Install Rust components
+ shell: bash
+ run: rustup component add rustfmt
+
- name: Check formatting
working-directory: test
run: |-