Skip to content

Commit 134f684

Browse files
author
Ganesh Jangir
committed
try same approach for musl
1 parent e5c5584 commit 134f684

File tree

2 files changed

+51
-18
lines changed

2 files changed

+51
-18
lines changed

.github/workflows/dotnet.yml

Lines changed: 49 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ jobs:
3838
- os: arm-4core-linux-ubuntu24.04
3939
target: aarch64-unknown-linux-gnu
4040
container: centos:7
41-
# - os: ubuntu-latest
42-
# target: x86_64-unknown-linux-musl
43-
# - os: ubuntu-latest
44-
# target: aarch64-unknown-linux-musl
41+
- os: ubuntu-latest
42+
target: x86_64-unknown-linux-musl
43+
container: alpine:3.19
44+
- os: ubuntu-latest
45+
target: aarch64-unknown-linux-musl
46+
container: alpine:3.19
4547
- os: macos-latest
4648
target: aarch64-apple-darwin
4749
- os: macos-latest
@@ -93,6 +95,38 @@ jobs:
9395
cd /workspace
9496
./windows/build-artifacts.sh ${{ env.OUTPUT_DIR }} ${{ matrix.target }}
9597
98+
- name: alpine:3.19
99+
uses: addnab/docker-run-action@v3
100+
if: matrix.container == 'alpine:3.19'
101+
with:
102+
image: ${{ matrix.container }}
103+
options: -v ${{ github.workspace }}:/workspace
104+
run: |
105+
apk update \
106+
&& apk add --no-cache \
107+
build-base \
108+
cargo \
109+
cmake \
110+
curl \
111+
git \
112+
make \
113+
patchelf \
114+
protoc \
115+
pkgconf \
116+
unzip \
117+
bash \
118+
jq \
119+
clang16-libclang \
120+
&& mkdir /usr/local/src \
121+
122+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
123+
source $HOME/.cargo/env
124+
rustup target add ${{ matrix.target }}
125+
cargo install --force cbindgen
126+
127+
cd /workspace
128+
./windows/build-artifacts.sh ${{ env.OUTPUT_DIR }} ${{ matrix.target }}
129+
96130
- name: Windows
97131
if: matrix.os == 'windows-latest'
98132
run: |
@@ -161,17 +195,17 @@ jobs:
161195
name: ${{ env.OUTPUT_DIR }}-aarch64-unknown-linux-gnu
162196
path: bin
163197

164-
# - name: Download x86_64-unknown-linux-musl
165-
# uses: actions/download-artifact@v4
166-
# with:
167-
# name: ${{ env.OUTPUT_DIR }}-x86_64-unknown-linux-musl
168-
# path: bin
169-
170-
# - name: Download aarch64-unknown-linux-musl
171-
# uses: actions/download-artifact@v4
172-
# with:
173-
# name: ${{ env.OUTPUT_DIR }}-aarch64-unknown-linux-musl
174-
# path: bin
198+
- name: Download x86_64-unknown-linux-musl
199+
uses: actions/download-artifact@v4
200+
with:
201+
name: ${{ env.OUTPUT_DIR }}-x86_64-unknown-linux-musl
202+
path: bin
203+
204+
- name: Download aarch64-unknown-linux-musl
205+
uses: actions/download-artifact@v4
206+
with:
207+
name: ${{ env.OUTPUT_DIR }}-aarch64-unknown-linux-musl
208+
path: bin
175209

176210
- name: Download aarch64-apple-darwin
177211
uses: actions/download-artifact@v4

windows/libdatadog.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,11 @@
9797
<None Include="$(LibDatadogBinariesOutputDir)\aarch64-unknown-linux-gnu\release\libdatadog_profiling_ffi.so"
9898
Pack="true" PackagePath="runtimes\linux-arm64\native\datadog_profiling_ffi.so" />
9999

100-
<!-- musl corss compiling has issues in CI -->
101-
<!-- <None Include="$(LibDatadogBinariesOutputDir)\x86_64-unknown-linux-musl\release\libdatadog_profiling_ffi.so"
100+
<None Include="$(LibDatadogBinariesOutputDir)\x86_64-unknown-linux-musl\release\libdatadog_profiling_ffi.so"
102101
Pack="true" PackagePath="runtimes\linux-musl-x64\native\datadog_profiling_ffi.so" />
103102

104103
<None Include="$(LibDatadogBinariesOutputDir)\aarch64-unknown-linux-musl\release\libdatadog_profiling_ffi.so"
105-
Pack="true" PackagePath="runtimes\linux-musl-arm64\native\datadog_profiling_ffi.so" /> -->
104+
Pack="true" PackagePath="runtimes\linux-musl-arm64\native\datadog_profiling_ffi.so" />
106105

107106
<None Include="$(LibDatadogBinariesOutputDir)\aarch64-apple-darwin\release\libdatadog_profiling_ffi.dylib"
108107
Pack="true" PackagePath="runtimes\osx-arm64\native\datadog_profiling_ffi.dylib" />

0 commit comments

Comments
 (0)