Skip to content

Commit b85edbc

Browse files
committed
Avoid duplicate native release builds
1 parent feb1c92 commit b85edbc

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

.github/workflows/template_native_build.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,13 @@ jobs:
9494
shell: bash
9595
run: |
9696
if [ "${{ inputs.linux_cross }}" = "true" ]; then
97-
soldr cargo zigbuild --release --target ${{ inputs.target }} -p fbuild-cli
98-
soldr cargo zigbuild --release --target ${{ inputs.target }} -p fbuild-daemon
97+
soldr cargo zigbuild --release --target ${{ inputs.target }} \
98+
-p fbuild-cli \
99+
-p fbuild-daemon
99100
else
100-
soldr cargo build --release --target ${{ inputs.target }} -p fbuild-cli
101-
soldr cargo build --release --target ${{ inputs.target }} -p fbuild-daemon
101+
soldr cargo build --release --target ${{ inputs.target }} \
102+
-p fbuild-cli \
103+
-p fbuild-daemon
102104
fi
103105
104106
# PyO3 extension — built for ALL targets, including cross-compiled.
@@ -129,9 +131,13 @@ jobs:
129131
--target ${{ inputs.target }} -p fbuild-python \
130132
--features extension-module
131133
elif [ "${{ runner.os }}" = "macOS" ]; then
132-
soldr cargo build --release -p fbuild-python --features extension-module
134+
soldr cargo build --release --target ${{ inputs.target }} \
135+
-p fbuild-python \
136+
--features extension-module
133137
else
134-
soldr cargo build --release -p fbuild-python --features extension-module
138+
soldr cargo build --release --target ${{ inputs.target }} \
139+
-p fbuild-python \
140+
--features extension-module
135141
fi
136142
137143
- name: Stage artifacts
@@ -147,7 +153,7 @@ jobs:
147153
ARCH="${TARGET%%-*}"
148154
ext_src="target/${ARCH}-unknown-linux-gnu/release/lib_native.so"
149155
[ -f "$ext_src" ] && cp "$ext_src" staging/_native.abi3.so
150-
elif [ "${{ inputs.macos_cross }}" = "true" ]; then
156+
elif [ "${{ runner.os }}" = "macOS" ]; then
151157
ext_src="target/${{ inputs.target }}/release/lib_native.dylib"
152158
[ -f "$ext_src" ] && cp "$ext_src" staging/_native.abi3.so
153159
elif [ "${{ inputs.binary_ext }}" = ".exe" ]; then

0 commit comments

Comments
 (0)