Skip to content

Commit e5ff664

Browse files
committed
well idk, let's try this one
1 parent 1b960f5 commit e5ff664

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

.github/workflows/opencvsharp.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ jobs:
146146
cat <<'EOS'
147147
set -eux
148148
149-
EXTRA_FLAGS=()
149+
set --
150150
OpenCV_DIR="${{ github.workspace }}/opencv/lib/cmake/opencv4"
151151
152152
if [[ "${{ matrix.os }}" =~ ^win ]]; then
153153
OpenCV_DIR="${{ github.workspace }}/opencv/${{ matrix.arch }}/vc17/staticlib"
154154
if [[ "${{ matrix.arch }}" == "x86" ]]; then
155-
EXTRA_FLAGS+=( "-A" "Win32" )
155+
set -- "$@" -A Win32
156156
fi
157157
158158
elif [[ "${{ matrix.image }}" =~ ^oraclelinux ]]; then
@@ -162,36 +162,35 @@ jobs:
162162
fi
163163
164164
elif [[ "${{ matrix.os }}" =~ ^alpine ]]; then
165-
EXTRA_FLAGS+=( "-DCMAKE_SHARED_LINKER_FLAGS=-static-libstdc++ -static-libgcc" )
165+
set -- "$@" "-DCMAKE_SHARED_LINKER_FLAGS=-static-libstdc++ -static-libgcc"
166166
167167
elif [[ ${{ matrix.os }} == "android" ]]; then
168168
OpenCV_DIR="${{ github.workspace }}/opencv/sdk/native/jni"
169-
EXTRA_FLAGS+=(
170-
"-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake"
171-
"-DANDROID_PLATFORM=android-24"
169+
set -- "$@" \
170+
"-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
171+
"-DANDROID_PLATFORM=android-24" \
172172
"-DANDROID_STL=c++_static"
173-
)
174173
175174
if [[ "${{ matrix.arch }}" == "arm64" ]]; then
176-
EXTRA_FLAGS+=( "-DANDROID_ABI=arm64-v8a" )
175+
set -- "$@" "-DANDROID_ABI=arm64-v8a"
177176
elif [[ "${{ matrix.arch }}" == "x64" ]]; then
178-
EXTRA_FLAGS+=( "-DANDROID_ABI=x86_64" )
177+
set -- "$@" "-DANDROID_ABI=x86_64"
179178
fi
180179
fi
181180
182181
cd opencvsharp && mkdir build && cd build
183182
cmake \
184183
-D CMAKE_INSTALL_PREFIX="${{ github.workspace }}/opencvsharp/build" \
185184
-D OpenCV_DIR="$OpenCV_DIR" \
186-
"${EXTRA_FLAGS[@]}" \
185+
"$@" \
187186
../src
188187
EOS
189188
)
190189
191190
if [[ "${{ matrix.image }}" == "" ]]; then
192191
bash -c "$script"
193192
else
194-
docker exec builder bash -c "$script"
193+
docker exec builder /bin/sh -c "$script"
195194
fi
196195
197196
- name: Build OpenCvSharp

0 commit comments

Comments
 (0)