Goreleaser Fix (#30 )

* Goreleaser Bug Theoretically this config should work but it doesn't * Specify `goamd64`
Fixed x86_64 Homebrew update (#29 )
2026-10-01 04:21:54 +02:00 · 2024-01-24 19:09:59 +04:00 · 2024-01-24 07:30:36 -05:00 · 2024-01-24 15:23:04 +04:00 · 2023-09-12 06:59:02 -04:00 · 2023-05-05 03:19:40 +04:00
7 changed files with 38 additions and 35 deletions
@@ -4,17 +4,18 @@ env:
 task:
  name: Build
  macos_instance:
-    image: ghcr.io/cirruslabs/macos-monterey-xcode:14
+    image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
  install_rust_script:
    - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+    - rustup target add x86_64-apple-darwin
  build_script:
-    - cargo build
+    - cargo build --target aarch64-apple-darwin --target x86_64-apple-darwin

 task:
  name: Release
  only_if: $CIRRUS_TAG != ''
  macos_instance:
-    image: ghcr.io/cirruslabs/macos-monterey-xcode:14
+    image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
  env:
    GITHUB_TOKEN: ENCRYPTED[!98ace8259c6024da912c14d5a3c5c6aac186890a8d4819fad78f3e0c41a4e0cd3a2537dd6e91493952fb056fa434be7c!]
    GORELEASER_KEY: ENCRYPTED[!9b80b6ef684ceaf40edd4c7af93014ee156c8aba7e6e5795f41c482729887b5c31f36b651491d790f1f668670888d9fd!]
@@ -23,13 +24,14 @@ task:
    SENTRY_AUTH_TOKEN: ENCRYPTED[!c16a5cf7da5f856b4bc2f21fe8cb7aa2a6c981f851c094ed4d3025fd02ea59a58a86cee8b193a69a1fc20fa217e56ac3!]
  install_rust_script:
    - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+    - rustup target add x86_64-apple-darwin
  install_script:
    - brew install go goreleaser/tap/goreleaser-pro getsentry/tools/sentry-cli
  build_script:
-    - cargo build --profile release-with-debug
+    - cargo build --target aarch64-apple-darwin --target x86_64-apple-darwin --profile release-with-debug
  release_script: goreleaser
  upload_sentry_debug_files_script:
-    - cd target/release-with-debug/
+    - cd target/aarch64-apple-darwin/release-with-debug/
    # Generate and upload symbols
    - dsymutil softnet
    - sentry-cli debug-files upload -o $SENTRY_ORG -p $SENTRY_PROJECT softnet.dSYM/
@@ -1 +1,3 @@
+/.idea
+/dist
 /target
@@ -1,29 +1,27 @@
 project_name: softnet

 builds:
-  - builder: prebuilt
+  - id: softnet
+    builder: prebuilt
+    goamd64: [v1]
    goos:
      - darwin
    goarch:
      - arm64
+      - amd64
    prebuilt:
-      path: "target/release-with-debug/softnet"
+      path: 'target/{{- if eq .Arch "arm64" }}aarch64{{- else }}x86_64{{ end }}-apple-darwin/release-with-debug/softnet'

 archives:
-  - id: binary
-    format: binary
-    name_template: "{{ .ProjectName }}"
  - id: regular
-    name_template: "{{ .ProjectName }}"
+    name_template: "{{ .ProjectName }}-{{ .Arch }}"

 release:
  prerelease: auto

 brews:
  - name: softnet
-    ids:
-      - regular
-    tap:
+    repository:
      owner: cirruslabs
      name: homebrew-cli
    caveats: See the Github repository for more information
@@ -821,9 +821,9 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"

 [[package]]
 name = "openssl"
-version = "0.10.45"
+version = "0.10.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
+checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2"
 dependencies = [
 "bitflags",
 "cfg-if",
@@ -853,9 +853,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

 [[package]]
 name = "openssl-sys"
-version = "0.9.80"
+version = "0.9.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
+checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b"
 dependencies = [
 "autocfg",
 "cc",
@@ -970,9 +970,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.51"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
 dependencies = [
 "unicode-ident",
 ]
@@ -1351,7 +1351,7 @@ dependencies = [
 "sentry-anyhow",
 "smoltcp",
 "system-configuration",
- "users",
+ "uzers",
 "vmnet",
 ]

@@ -1634,16 +1634,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "users"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032"
-dependencies = [
- "libc",
- "log",
-]
-
 [[package]]
 name = "uuid"
 version = "1.3.0"
@@ -1654,6 +1644,16 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "uzers"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76d283dc7e8c901e79e32d077866eaf599156cbf427fffa8289aecc52c5c3f63"
+dependencies = [
+ "libc",
+ "log",
+]
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -22,7 +22,7 @@ mac_address = "1.1.3"
 privdrop = "0.5.2"
 anyhow = { version = "1.0.66", features = ["backtrace"] }
 ip_network = "0.4.1"
-users = "0.11.0"
+uzers = "0.11.3"
 system-configuration = "0.5.0"
 num_enum = "0.5.7"
 sentry = { version = "0.29.1", features = ["debug-images"] }
@@ -1,13 +1,14 @@
 # Softnet

 Softnet is a software networking for [Tart](https://github.com/cirruslabs/tart) which provides better network isolation and alleviates DHCP shortage on production systems.
+Please check out [this blog post](https://cirrus-ci.org/blog/2022/07/07/isolating-network-between-tarts-macos-virtual-machines/) for backstory.

 ## Working model

 Softnet solves two problems:

 1. VM network isolation
-  * [`VZNATNetworkDeviceAttachment`](https://developer.apple.com/documentation/virtualization/vznatnetworkdeviceattachment) (the default networking in Tart) enables [vmnet's bridge isolation](https://developer.apple.com/documentation/vmnet/vmnet_enable_isolation_key) by default and prevents cross-VM traffic, however it's still possible for any VM to spoof the host's ARP-table and capture other VMs traffic, for example
+  * [`VZNATNetworkDeviceAttachment`](https://developer.apple.com/documentation/virtualization/vznatnetworkdeviceattachment) (the default networking in Tart) enables [vmnet's bridge isolation](https://developer.apple.com/documentation/vmnet/vmnet_enable_isolation_key) by default and prevents cross-VM traffic, however it's still possible for any VM to spoof the host's ARP-table and capture other VMs traffic
 2. DHCP exhaustion
  * macOS built-in DHCP-server allocates a `/24` subnet with 86400 seconds lease time by default, which only allows for ~253 VMs a day (or 1 VM every ~6 minutes) to be spawned without causing a denial-of-service, which is pretty limiting for CI services like Cirrus CI

@@ -30,4 +31,4 @@ For proper functioning, Softnet binary requires two things:

 ## Running

-Softnet is started and managed automatically by Tart if `--with-softnet` flag is present when calling `tart run`.
+Softnet is started and managed automatically by Tart if `--net-softnet` flag is provided when calling `tart run`.
@@ -15,7 +15,7 @@ use system_configuration::core_foundation::number::CFNumber;
 use system_configuration::core_foundation::string::CFString;
 use system_configuration::preferences::SCPreferences;
 use system_configuration::sys::preferences::{SCPreferencesCommitChanges, SCPreferencesSetValue};
-use users::{get_current_groupname, get_current_username, get_effective_uid};
+use uzers::{get_current_groupname, get_current_username, get_effective_uid};

 #[derive(Parser, Debug)]
 struct Args {
Author	SHA1	Message	Date
Fedor Korotkov	f5a1b1cdbd	Goreleaser Fix (#30 ) * Goreleaser Bug Theoretically this config should work but it doesn't * Specify `goamd64`	2024-01-24 19:09:59 +04:00
Fedor Korotkov	817dbb6e32	Fixed `x86_64` Homebrew update (#29 ) Seems we need to build separate archives too and pass it to `brew`.	2024-01-24 07:30:36 -05:00
Fedor Korotkov	5f3b371e93	Build for `x86_64` (#28 )	2024-01-24 15:23:04 +04:00
Nikolay Edigaryev	cd5f1d2f4f	Fix unaligned read by switching from unmaintained users crate (#26 ) * Fix unaligned read by switching from unmaintained users crate * Bump proc-macro2 to to fix "unknown feature `proc_macro_span_shrink`"	2023-09-12 06:59:02 -04:00
Fedor Korotkov	a775a92772	Add link to the blog post (#25 )	2023-05-05 03:19:40 +04:00
Nikolay Edigaryev	f38d65f98f	README.md: Tart now uses --net-softnet	2023-03-28 08:21:19 +04:00
dependabot[bot]	4ba480ff4f	Bump openssl from 0.10.45 to 0.10.48 (#24 ) Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.45 to 0.10.48. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.45...openssl-v0.10.48) --- updated-dependencies: - dependency-name: openssl dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-03-25 16:20:34 +04:00