Skip to content
Merged
39 changes: 36 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,23 @@ jobs:
name: Build
strategy:
matrix:
os: [ubuntu-22.04, windows-2022, macos-13, macos-14]
include:
- os: ubuntu-22.04
arch: amd64
- os: ubuntu-22.04
arch: arm64
- os: ubuntu-24.04
arch: amd64
- os: ubuntu-24.04
arch: arm64
- os: windows-2022
arch: x64
- os: macos-13
arch: x64
- os: macos-14
arch: arm64

runs-on: ${{ matrix.os }}
runs-on: ${{ (matrix.arch == 'arm64' && matrix.os == 'macos-14') && 'macos-14' || matrix.os }}

steps:
- name: checkout
Expand All @@ -23,5 +37,24 @@ jobs:
uses: extractions/setup-just@v1
with:
just-version: 1.14.0
- name: Build and Test
- name: Setup cross-compilation for ARM64 Linux
if: ${{ startsWith(matrix.os, 'ubuntu-') && matrix.arch == 'arm64' }}
run: |
rustup target add aarch64-unknown-linux-gnu
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu pkg-config
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV

- name: Build and Test (ARM64 Linux Cross-Compilation)
if: ${{ startsWith(matrix.os, 'ubuntu-') && matrix.arch == 'arm64' }}
run: |
just fmt
git diff --exit-code
just check
cargo build --locked --target aarch64-unknown-linux-gnu
just test

- name: Build and Test (Standard)
if: ${{ !(startsWith(matrix.os, 'ubuntu-') && matrix.arch == 'arm64') }}
run: just ci
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,20 @@ jobs:
include:
- os: ubuntu-22.04
arch: amd64
- os: ubuntu-22.04
arch: arm64
- os: ubuntu-24.04
arch: amd64
- os: ubuntu-24.04
arch: arm64
- os: windows-2022
arch: x64
- os: macos-13
arch: x64
- os: macos-14
arch: arm64

runs-on: ${{ matrix.os }}
runs-on: ${{ (matrix.arch == 'arm64' && matrix.os == 'macos-14') && 'macos-14' || matrix.os }}

steps:
- uses: actions/checkout@v2
Expand Down
153 changes: 1 addition & 152 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[package]
name = "esc"
version = "1.24.3"
version = "1.27.0"
authors = [
"Yorick Laupa <yorick.laupa@eventstore.com>",
"Tim Simpson <tim.simpson@eventstore.com>",
"Brock Shelton <goabshelto@gmail.com>",
]
edition = "2018"

Expand Down Expand Up @@ -33,5 +34,5 @@ rustyline = "6.2"
cidr = "0.1"
clap = "*"
clap_complete = "*"
reqwest = { version = "0.11", features = ["json", "rustls-tls-native-roots"] }
reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls-native-roots"] }
validator = "0.10"
2 changes: 1 addition & 1 deletion generated/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ log = "0.4"
validator = "0.10"
chrono = { version = "0.4", features = ["serde"] }
bytes = "0.5"
reqwest = { version = "0.11", features = ["json", "rustls-tls-native-roots"] }
reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls-native-roots"] }
urlencoding = "1.3.3"

[dev-dependencies]
Expand Down
Loading