Skip to content

Commit

Permalink
Add cross configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
pvshvp-oss committed Mar 12, 2024
1 parent ceab42c commit c66fc32
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/code_validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ jobs:
id: cache_setup_step
uses: Swatinem/rust-cache@v2
- name: ↕️ Install Ubuntu Dependencies Step
id: dependencies_install_step
if: ${{ matrix.cicd_runner == 'ubuntu-latest' }}
id: ubuntu_dependencies_install_step
if: ${{ matrix.cicd_runner == 'ubuntu-latest' && command_base == 'cargo' }}
uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: libssl-dev openssl libgtk-4-dev
packages: build-essential libssl-dev libgtk-4-dev
version: 1.0
- name: 📑 Fmt Step
id: fmt_step
Expand Down
6 changes: 6 additions & 0 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[workspace.metadata.cross.target.aarch64-unknown-linux-gnu]
# Install libssl-dev:arm64, see <https://github.com/cross-rs/cross/blob/main/docs/custom_images.md#adding-dependencies-to-existing-images>
pre-build = [
"dpkg --add-architecture $CROSS_DEB_ARCH",
"apt-get update && apt-get --assume-yes install build-essential:$CROSS_DEB_ARCH libssl-dev:$CROSS_DEB_ARCH libgtk-4-dev:$CROSS_DEB_ARCH"
]
1 change: 1 addition & 0 deletions paxy-gui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ owo-colors = { workspace = true }
console = { workspace = true }

# GUI
# TODO: install dependencies for Windows and MacOS in the CI before removing the below filter restricting relm4 to Linux
[target.'cfg(target_os = "linux")'.dependencies]
relm4 = { workspace = true }
relm4-components = { workspace = true }
3 changes: 2 additions & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ channel = "nightly"
components = ["rustc", "cargo", "rust-std", "rustfmt"]
targets = [
"x86_64-unknown-linux-gnu",
"x86_64-pc-windows-gnu",
"x86_64-pc-windows-msvc",
"x86_64-apple-darwin",
"aarch64-unknown-linux-gnu",
"aarch64-pc-windows-msvc",
"aarch64-apple-darwin",
]

0 comments on commit c66fc32

Please sign in to comment.