Skip to content

Commit e02a6da

Browse files
committed
try cross tool
cleanup workflow a bit rename test job at runtime bump codecov action
1 parent adecf1f commit e02a6da

File tree

2 files changed

+22
-24
lines changed

2 files changed

+22
-24
lines changed

.github/workflows/binary-builds.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@ jobs:
3434
include:
3535
- target: aarch64-unknown-linux-gnu
3636
os: ubuntu-latest
37-
## I GIVE UP! For this target, OpenSSL needs to be cross compiled
38-
## which is driven by openssl-sys crate's custom build script...
39-
## Linux users with aarch64 (aka ARM64) using musl C lib can go fish (or build from source).
40-
# - target: aarch64-unknown-linux-musl
41-
# os: ubuntu-latest
37+
- target: aarch64-unknown-linux-musl
38+
os: ubuntu-latest
4239
- target: x86_64-unknown-linux-gnu
4340
os: ubuntu-latest
4441
- target: x86_64-unknown-linux-musl
@@ -73,7 +70,7 @@ jobs:
7370
id: is-openssl-vendored
7471
run: |
7572
case "${{ matrix.target }}" in
76-
"aarch64-apple-darwin" | "x86_64-apple-darwin" | "aarch64-unknown-linux-gnu" | "aarch64-unknown-linux-musl" | "x86_64-unknown-linux-musl")
73+
"aarch64-apple-darwin" | "x86_64-apple-darwin") # | "aarch64-unknown-linux-gnu" | "aarch64-unknown-linux-musl" | "x86_64-unknown-linux-musl"
7774
echo "enabled=--features openssl-vendored" >> $GITHUB_OUTPUT
7875
;;
7976
*)
@@ -98,20 +95,20 @@ jobs:
9895
with:
9996
target: ${{ matrix.target }}
10097

101-
# problems with cross-compiling linux with musl
102-
- run: echo "RUSTFLAGS=-D warnings -C target-feature=+crt-static -C link-self-contained=yes" >> "${GITHUB_ENV}"
103-
if: contains(matrix.target, '-linux-musl')
104-
- run: |
105-
echo "CC=aarch64-linux-gnu-gcc" >> "$GITHUB_ENV"
106-
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-gnu-gcc" >> "$GITHUB_ENV"
107-
if: matrix.target == 'aarch64-unknown-linux-musl'
98+
- name: Install cross (cargo cross compiler)
99+
if: matrix.os == 'ubuntu-latest' && (endsWith(matrix.target, 'musl') || startsWith(matrix.target, 'aarch64'))
100+
uses: taiki-e/install-action@v2
101+
with:
102+
tool: cross
108103

109-
- name: Build
110-
env:
111-
# problems with cross-compiling aarch64 linux with gnu
112-
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: /usr/bin/aarch64-linux-gnu-gcc
104+
- name: Build (native)
105+
if: ${{!(matrix.os == 'ubuntu-latest' && (endsWith(matrix.target, 'musl') || startsWith(matrix.target, 'aarch64')))}}
113106
run: cargo build --manifest-path cpp-linter-lib/Cargo.toml --release --bin cpp-linter --target ${{ matrix.target }} ${{ steps.is-openssl-vendored.outputs.enabled }}
114107

108+
- name: Build (cross)
109+
if: matrix.os == 'ubuntu-latest' && (endsWith(matrix.target, 'musl') || startsWith(matrix.target, 'aarch64'))
110+
run: cross build --manifest-path cpp-linter-lib/Cargo.toml --release --bin cpp-linter --target ${{ matrix.target }} ${{ steps.is-openssl-vendored.outputs.enabled }}
111+
115112
- name: Prepare artifacts
116113
run: mv target/${{ matrix.target }}/release/cpp-linter${{ runner.os == 'Windows' && '.exe' || '' }} ./cpp-linter-${{ matrix.target }}${{ runner.os == 'Windows' && '.exe' || '' }}
117114
- name: Upload artifacts

.github/workflows/run-dev-tests.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ env:
2020

2121
jobs:
2222
test:
23+
name: test ${{ matrix.os }} w/ clang v${{ matrix.version }}
2324
strategy:
2425
fail-fast: false
2526
matrix:
@@ -33,12 +34,12 @@ jobs:
3334
- run: rustup component add llvm-tools-preview
3435

3536
# https://docs.rs/openssl/latest/openssl/#automatic
36-
- name: Install OpenSSL (Linux)
37-
if: runner.os == 'Linux'
38-
run: sudo apt-get install -y pkg-config libssl-dev
39-
- name: Install OpenSSL (MacOS)
40-
if: runner.os == 'macOS'
41-
run: brew install openssl@3
37+
# - name: Install OpenSSL (Linux)
38+
# if: runner.os == 'Linux'
39+
# run: sudo apt-get install -y pkg-config libssl-dev
40+
# - name: Install OpenSSL (MacOS)
41+
# if: runner.os == 'macOS'
42+
# run: brew install openssl@3
4243
# - name: Install OpenSSL (Windows)
4344
# if: runner.os == 'Windows'
4445
# run: vcpkg install openssl
@@ -114,7 +115,7 @@ jobs:
114115
run: |
115116
cargo llvm-cov report --lcov --output-path lcov.info
116117
117-
- uses: codecov/codecov-action@v3
118+
- uses: codecov/codecov-action@v4
118119
if: matrix.version == '16' && runner.os == 'Linux'
119120
with:
120121
token: ${{secrets.CODECOV_TOKEN}}

0 commit comments

Comments
 (0)