MIRROR: javascript for 🐜's, a tiny runtime with big ambitions
improve Windows path handling in build-native-deps action
+12
-5
+12
-5
.github/actions/build-native-deps/action.yml
+12
-5
.github/actions/build-native-deps/action.yml
···
50
50
key: deps-${{ runner.os }}-${{ runner.arch }}-${{ steps.deps-hash.outputs.hash }}-${{ hashFiles('.github/versions.json') }}-v1
51
51
52
52
- name: Prepare build environment
53
+
id: prep
53
54
if: steps.cache.outputs.cache-hit != 'true'
54
55
shell: bash
55
56
run: |
56
-
mkdir -p ${{ inputs.prefix }}
57
+
if [[ "$RUNNER_OS" == "Windows" ]]; then
58
+
PREFIX=$(cygpath -m "${{ inputs.prefix }}")
59
+
else
60
+
PREFIX="${{ inputs.prefix }}"
61
+
fi
62
+
echo "prefix=$PREFIX" >> $GITHUB_OUTPUT
63
+
mkdir -p "$PREFIX"
57
64
58
65
- name: Build libsodium
59
66
if: steps.cache.outputs.cache-hit != 'true' && contains(inputs.deps, 'libsodium')
···
61
68
run: |
62
69
git clone --depth 1 --branch ${{ inputs.libsodium_version }}-RELEASE https://github.com/jedisct1/libsodium.git /tmp/libsodium
63
70
cd /tmp/libsodium
64
-
./configure CC=${{ inputs.cc }} --prefix=${{ inputs.prefix }} --disable-shared --enable-static
71
+
./configure CC=${{ inputs.cc }} --prefix=${{ steps.prep.outputs.prefix }} --disable-shared --enable-static
65
72
make -j$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 4)
66
73
make install
67
74
···
74
81
CMAKE_GENERATOR="${{ inputs.cmake_generator }}"
75
82
CC=${{ inputs.cc }} cmake -B build \
76
83
${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \
77
-
-DCMAKE_INSTALL_PREFIX=${{ inputs.prefix }} \
84
+
-DCMAKE_INSTALL_PREFIX=${{ steps.prep.outputs.prefix }} \
78
85
-DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF \
79
86
-DCMAKE_BUILD_TYPE=Release \
80
87
-DUSE_STATIC_MBEDTLS_LIBRARY=ON -DUSE_SHARED_MBEDTLS_LIBRARY=OFF
···
94
101
fi
95
102
CC=${{ inputs.cc }} cmake -B build \
96
103
${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \
97
-
-DCMAKE_INSTALL_PREFIX=${{ inputs.prefix }} \
104
+
-DCMAKE_INSTALL_PREFIX=${{ steps.prep.outputs.prefix }} \
98
105
-DBUILD_SHARED_LIBS=OFF \
99
106
-DCMAKE_BUILD_TYPE=MinSizeRel
100
107
cmake --build build
101
108
cmake --install build
102
-
rm -f ${{ inputs.prefix }}/lib/libz.so* 2>/dev/null || true
109
+
rm -f ${{ steps.prep.outputs.prefix }}/lib/libz.so* 2>/dev/null || true