Skip to content

Commit

Permalink
Merge remote-tracking branch 'metalbear-co/main' into dimad/mbe-510-p…
Browse files Browse the repository at this point in the history
…roxy-randomly-closes-during-connection
  • Loading branch information
DmitryDodzin committed Feb 2, 2025
2 parents 83bd575 + d5c9170 commit 359f5fe
Show file tree
Hide file tree
Showing 35 changed files with 385 additions and 109 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
- run: rm rust-toolchain.toml
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2024-10-11
toolchain: nightly-2025-01-22
components: rustfmt, clippy
target: aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu
- uses: actions/setup-python@v5 # For http mirroring tests with Flask and FastAPI.
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2024-10-11
toolchain: nightly-2025-01-22
# TODO(alex): `no-deps` here due to an issue in `futures-util`.
- run: cargo doc --document-private-items --no-deps

Expand All @@ -210,7 +210,7 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
# the setup rust toolchain action ignores the input if file exists.. so remove it
- run: rm rust-toolchain.toml
- run: rustup default nightly-2024-10-11
- run: rustup default nightly-2025-01-22
- name: test
run: cargo test --target x86_64-unknown-linux-gnu -p mirrord-agent

Expand Down Expand Up @@ -391,7 +391,7 @@ jobs:
with:
components: rustfmt, clippy
target: aarch64-apple-darwin
toolchain: nightly-2024-10-11
toolchain: nightly-2025-01-22
- name: Install Protoc
uses: arduino/setup-protoc@v3
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
target: x86_64-apple-darwin,aarch64-apple-darwin
toolchain: nightly-2024-10-11
toolchain: nightly-2025-01-22
rustflags: ""
- name: Import Code-Signing Certificates
uses: Apple-Actions/import-codesign-certs@v3
Expand All @@ -75,8 +75,8 @@ jobs:
# Instead of spoofing an arm64e by changing bits, we now use a code shim compiled as arm64e that loads the arm64 layer
- name: build mirrord-layer x86-64, arm and code shim
run: |
cargo +nightly-2024-10-11 build --release -p mirrord-layer --target=aarch64-apple-darwin
cargo +nightly-2024-10-11 build --release -p mirrord-layer --target=x86_64-apple-darwin
cargo +nightly-2025-01-22 build --release -p mirrord-layer --target=aarch64-apple-darwin
cargo +nightly-2025-01-22 build --release -p mirrord-layer --target=x86_64-apple-darwin
clang -arch arm64e -dynamiclib -o target/aarch64-apple-darwin/release/shim.dylib mirrord/layer/shim.c
- name: Sign layer binaries and code shim
env:
Expand All @@ -96,11 +96,11 @@ jobs:
env:
MIRRORD_LAYER_FILE: /tmp/target/universal-apple-darwin/release/libmirrord_layer.dylib
MIRRORD_LAYER_FILE_MACOS_ARM64: ../../../target/aarch64-apple-darwin/release/libmirrord_layer.dylib
run: cargo +nightly-2024-10-11 build --release -p mirrord --target=aarch64-apple-darwin
run: cargo +nightly-2025-01-22 build --release -p mirrord --target=aarch64-apple-darwin
- name: build macOS x86-64 cli with universal dylib
env:
MIRRORD_LAYER_FILE: /tmp/target/universal-apple-darwin/release/libmirrord_layer.dylib
run: cargo +nightly-2024-10-11 build --release -p mirrord --target=x86_64-apple-darwin
run: cargo +nightly-2025-01-22 build --release -p mirrord --target=x86_64-apple-darwin
- name: Sign cli binaries
env:
AC_USERNAME: ${{ secrets.APPLE_DEVELOPER }}
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,20 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang

<!-- towncrier release notes start -->

## [3.131.2](https://github.com/metalbear-co/mirrord/tree/3.131.2) - 2025-01-29


### Fixed

- Removed an error log on a `notimplemented` response from the `mirrord-intproxy`,
might fix go crash.
[#3044](https://github.com/metalbear-co/mirrord/issues/3044)


### Internal

- Updated Rust toolchain to nightly-2025-01-22.

## [3.131.1](https://github.com/metalbear-co/mirrord/tree/3.131.1) - 2025-01-28


Expand Down
10 changes: 10 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -570,3 +570,13 @@ cargo-zigbuild clippy --lib --bins --all-features --target x86_64-unknown-linux-
If it doesn't work, try updating `cargo-zigbuild`
(`cargo install cargo-zigbuild` or maybe `cargo install cargo-zigbuild --force`)
or via `homebrew` if it was installed via homebrew.
# Adding new target types
Adding a new target type for mirrord requires changes in:
1. `mirrord-config` crate - parsing the target from the user config;
2. `mirrord-cli` crate - verifying the user config;
3. `mirrord-kube` crate - resolving the target to the Kubernetes resource;
4. `mirrord-operator` crate - defining operator's `ClusterRole`;
5. `test` crate - testing `mirrord ls` command
Loading

0 comments on commit 359f5fe

Please sign in to comment.