diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-02-08 17:30:34 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-02-08 17:30:34 +0100 |
| commit | 8b6acc5c4394d8013d84ff0604a06ceb114f3a2e (patch) | |
| tree | e79f37aa0e2a94fe5d00d8551427baf0520b92f1 | |
| parent | 09a1d72f4b1cd0afa458c5790de2d7f5835c9951 (diff) | |
| parent | c7f24fc7bf5fa272eea97364fe430b0479040e59 (diff) | |
| download | mullvadvpn-8b6acc5c4394d8013d84ff0604a06ceb114f3a2e.tar.xz mullvadvpn-8b6acc5c4394d8013d84ff0604a06ceb114f3a2e.zip | |
Merge branch 'ci-reenable-nightly'
| -rw-r--r-- | .github/workflows/daemon.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/rust-unused-dependencies.yml | 2 | ||||
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | talpid-types/Cargo.toml | 2 | ||||
| -rw-r--r-- | test/Cargo.lock | 8 |
5 files changed, 11 insertions, 15 deletions
diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml index 8fcea16948..3293e02879 100644 --- a/.github/workflows/daemon.yml +++ b/.github/workflows/daemon.yml @@ -57,11 +57,7 @@ jobs: strategy: matrix: - # FIXME: Temporarily disable nightly builds due to an issue with curve25519-dalek - # Once this has been fixed, enable nightly builds again: - # https://github.com/dalek-cryptography/curve25519-dalek/pull/619 - #rust: [stable, beta, nightly] - rust: [stable, beta] + rust: [stable, beta, nightly] continue-on-error: true steps: # Fix for HOME path overridden by GH runners when building in containers, see: diff --git a/.github/workflows/rust-unused-dependencies.yml b/.github/workflows/rust-unused-dependencies.yml index 98f279d1de..ac07b079c9 100644 --- a/.github/workflows/rust-unused-dependencies.yml +++ b/.github/workflows/rust-unused-dependencies.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: # Pinning nightly just to avoid random breakage. It's fine to bump this at any time - RUST_NIGHTLY_TOOLCHAIN: nightly-2024-01-07 + RUST_NIGHTLY_TOOLCHAIN: nightly-2024-02-06 jobs: prepare-containers: runs-on: ubuntu-latest diff --git a/Cargo.lock b/Cargo.lock index a2c553ab1e..3825d2b4d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -637,9 +637,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -4766,9 +4766,9 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core 0.6.4", diff --git a/talpid-types/Cargo.toml b/talpid-types/Cargo.toml index 2df0ec38af..bf87b12ba0 100644 --- a/talpid-types/Cargo.toml +++ b/talpid-types/Cargo.toml @@ -14,7 +14,7 @@ workspace = true serde = { version = "1.0", features = ["derive"] } ipnetwork = "0.16" base64 = "0.13" -x25519-dalek = { version = "2.0.0", features = ["static_secrets", "zeroize", "getrandom"] } +x25519-dalek = { version = "2.0.1", features = ["static_secrets", "zeroize", "getrandom"] } err-derive = { workspace = true } zeroize = "1.5.7" diff --git a/test/Cargo.lock b/test/Cargo.lock index 64d3552540..13b4ebcc19 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -572,9 +572,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -4078,9 +4078,9 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core 0.6.4", |
