Skip to content

Commit 47f958d

Browse files
committed
tweaks for 1.2.0-rc1
1 parent adcc334 commit 47f958d

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
name: CI
2-
env:
3-
$DNP3_TAG: 1.1.0
42
on:
53
push:
64
branches:
@@ -17,22 +15,18 @@ jobs:
1715
matrix:
1816
include:
1917
- target: x86_64-pc-windows-msvc # 64-bit MSVC (Windows 7+)
20-
extra-param: # nothing
2118
steps:
2219
- name: Checkout DNP3
2320
uses: actions/checkout@v3
2421
with:
2522
repository: stepfunc/dnp3
26-
ref: ${{ env.DNP3_TAG }}
23+
ref: 1.2.0-rc1
2724
- name: Install Rust
2825
uses: actions-rs/toolchain@v1
2926
with:
3027
profile: minimal
3128
toolchain: stable
3229
override: true
33-
- name: Copy Windows config
34-
shell: pwsh
35-
run: Copy-Item -Path .cargo/config-windows.toml -Destination .cargo/config.toml
3630
- name: Create FFI modules dir
3731
run: mkdir ffi-modules\${{ matrix.target }}
3832
- name: Build FFI
@@ -46,20 +40,28 @@ jobs:
4640
path: ffi-modules
4741
# Cross-compile FFI for Linux platforms
4842
ffi-cross:
43+
env:
44+
# By default, MUSL will not produce a cdylib with dynamic linkage to MUSL LIB C
45+
CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS: "-C target-feature=-crt-static"
46+
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS: "-C target-feature=-crt-static"
47+
CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_RUSTFLAGS: "-C target-feature=-crt-static"
4948
strategy:
5049
fail-fast: false
5150
matrix:
5251
target:
5352
- arm-unknown-linux-gnueabihf # ARMv6 Linux, hardfloat (kernel 3.2, glibc 2.17)
5453
- aarch64-unknown-linux-gnu # ARM64 Linux (kernel 4.2, glibc 2.17+)
5554
- x86_64-unknown-linux-gnu # 64-bit Linux (kernel 2.6.32+, glibc 2.11+)
55+
- aarch64-unknown-linux-musl # ARM64 Linux with MUSL
56+
- x86_64-unknown-linux-musl # 64-bit Linux with MUSL
57+
- arm-unknown-linux-musleabihf # ARMv6 Linux with MUSL, hardfloat
5658
runs-on: ubuntu-latest
5759
steps:
5860
- name: Checkout DNP3
5961
uses: actions/checkout@v3
6062
with:
6163
repository: stepfunc/dnp3
62-
ref: ${{ env.DNP3_TAG }}
64+
ref: 1.2.0-rc1
6365
- name: Install Rust
6466
uses: actions-rs/toolchain@v1
6567
with:
@@ -91,8 +93,6 @@ jobs:
9193
profile: minimal
9294
toolchain: stable
9395
override: true
94-
- name: Caching
95-
uses: Swatinem/rust-cache@v2
9696
- name: Checkout BOM tools repo
9797
uses: actions/checkout@v3
9898
with:
@@ -106,9 +106,9 @@ jobs:
106106
uses: actions/checkout@v3
107107
with:
108108
repository: stepfunc/dnp3
109-
ref: ${{ env.DNP3_TAG }}
109+
ref: 1.2.0-rc1
110110
- name: Download compiled FFI
111-
uses: actions/download-artifact@v2
111+
uses: actions/download-artifact@v3
112112
with:
113113
name: ffi-modules
114114
path: ffi-modules
@@ -123,7 +123,7 @@ jobs:
123123
uses: actions-rs/cargo@v1
124124
with:
125125
command: run
126-
args: --bin dnp3-bindings -- --dotnet --package ./ffi-modules -f third-party-licenses.txt
126+
args: --bin dnp3-bindings -- --dotnet --package ./ffi-modules -o ./packaging.json -f third-party-licenses.txt
127127
- name: Upload .NET bindings
128128
uses: actions/upload-artifact@v3
129129
with:

0 commit comments

Comments
 (0)