Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove version and publish from cargo metadata #5660

Merged
merged 3 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/rust-supply-chain.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Rust - Supply chain
on:

Check warning on line 3 in .github/workflows/rust-supply-chain.yml

View workflow job for this annotation

GitHub Actions / check-formatting

3:1 [truthy] truthy value should be one of [false, true]
pull_request:
paths:
- .github/workflows/rust-supply-chain.yml
Expand All @@ -20,4 +20,5 @@
uses: EmbarkStudios/cargo-deny-action@v1
with:
log-level: warn
rust-version: stable
command: check all
2 changes: 1 addition & 1 deletion .github/workflows/rust-unused-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-2023-08-03
RUST_NIGHTLY_TOOLCHAIN: nightly-2024-01-07
jobs:
prepare-containers:
runs-on: ubuntu-latest
Expand Down
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
[workspace.package]
version = "0.0.0"
authors = ["Mullvad VPN"]
repository = "https://github.com/mullvad/mullvadvpn-app/"
license = "GPL-3.0"
edition = "2021"
publish = false

[workspace]
resolver = "2"
Expand Down
2 changes: 0 additions & 2 deletions android/translations-converter/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "translations-converter"
description = "Converts between PO and Android style localization formats"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
[package]
name = "shadowsocks-proxy"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
[package]
name = "tunnel-obfuscator-proxy"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-api"
description = "Mullvad VPN API clients. Providing an interface to query our infrastructure for information."
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-cli"
description = "Manage the Mullvad VPN daemon via a convenient CLI"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-daemon/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-daemon"
description = "Mullvad VPN daemon. Runs and controls the VPN tunnels"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-exclude/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-exclude"
description = "Runs programs outside the Mullvad VPN tunnel on Linux"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-fs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-fs"
description = "File utility library"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-jni/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-jni"
description = "JNI interface for the Mullvad daemon"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-management-interface/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-management-interface"
description = "Mullvad VPN IPC. Contains types and functions for IPC clients and servers."
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-nsis/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-nsis"
description = "Helper library used by Mullvad NSIS plugins"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-paths/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-paths"
description = "Mullvad VPN application paths and directories"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-problem-report/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-problem-report"
description = "Collect Mullvad VPN logs into a report and send it to support"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-relay-selector/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-relay-selector"
description = "Mullvad VPN relay selector"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-setup/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-setup"
description = "Tool used to manage daemon setup"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "mullvad-types"
description = "Common base data structures for Mullvad VPN client"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions mullvad-version/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ what version string a build should have. This crate is responsible for computing
`-dev-$git_hash` suffix as well as transforming the version into semver, Android versionCode
and other formats.
"""
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions talpid-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "talpid-core"
description = "Privacy preserving and secure VPN client library"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions talpid-dbus/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
[package]
name = "talpid-dbus"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions talpid-openvpn-plugin/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "talpid-openvpn-plugin"
description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions talpid-openvpn/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "talpid-openvpn"
description = "Library for creating OpenVPN tunnels"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions talpid-platform-metadata/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "talpid-platform-metadata"
description = "Platform metadata detection functions"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions talpid-routing/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "talpid-routing"
description = "Library for managing routing tables"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions talpid-time/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "talpid-time"
description = "Time functions"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions talpid-tunnel-config-client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "talpid-tunnel-config-client"
description = "Uses the relay RPC service to set up PQ-safe peers, etc."
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions talpid-tunnel/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "talpid-tunnel"
description = "Library for creating tunnel devices and interfacing with various VPN tunnels"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions talpid-types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "talpid-types"
description = "Common base structures for talpid"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions talpid-windows/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "talpid-windows"
description = "Nice abstractions for Windows"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
2 changes: 0 additions & 2 deletions talpid-wireguard/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[package]
name = "talpid-wireguard"
description = "Library for creating various WireGuard tunnels"
version.workspace = true
authors.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
publish.workspace = true

[lints]
workspace = true
Expand Down
Loading
Loading