Skip to content

Commit 69cc516

Browse files
committed
Build also x64 version for comparison
1 parent 174416d commit 69cc516

File tree

2 files changed

+41
-3
lines changed

2 files changed

+41
-3
lines changed

.github/scripts/boost/build.sh

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22

33
source `dirname ${BASH_SOURCE[0]}`/../config.sh
44

5+
IS_X64=$1
6+
if [[ "$IS_X64" == "true" ]]; then
7+
echo "IS_X64 is true"
8+
sudo apt-get install mingw-w64
9+
ls /usr/bin | grep mingw
10+
echo $PATH | sed 's/:/\n/g'
11+
TOOLCHAIN_FILE=$ROOT_PATH/.github/cmake/x86_64-w64-mingw32.cmake
12+
BOOST_CONTEXT_ARCHITECTURE=x86_64
13+
BOOST_CONTEXT_ABI=ms
14+
else
15+
echo "IS_X64 is false"
16+
TOOLCHAIN_FILE=$ROOT_PATH/.github/cmake/aarch64-w64-mingw32.cmake
17+
BOOST_CONTEXT_ARCHITECTURE=arm64
18+
BOOST_CONTEXT_ABI=aapcs
19+
fi
20+
521
BOOST_BUILD_PATH=$BUILD_PATH/boost
622
BOOST_SOURCE_PATH=$SOURCE_PATH/boost
723

@@ -40,9 +56,9 @@ if [[ "$RUN_CONFIG" = 1 ]] || [[ ! -f "$BOOST_BUILD_PATH/Makefile" ]]; then
4056
-DBUILD_TESTING=ON \
4157
-DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN_FILE \
4258
-DBOOST_CHARCONV_QUADMATH_FOUND_EXITCODE=0 \
43-
-DBOOST_CONTEXT_ARCHITECTURE=arm64 \
59+
-DBOOST_CONTEXT_ARCHITECTURE=$BOOST_CONTEXT_ARCHITECTURE \
4460
-DBOOST_CONTEXT_BINARY_FORMAT=pe \
45-
-DBOOST_CONTEXT_ABI=aapcs \
61+
-DBOOST_CONTEXT_ABI=$BOOST_CONTEXT_ABI \
4662
-DBOOST_FIBER_NUMA_TARGET_OS=windows \
4763
-DBOOST_LOCALE_ENABLE_POSIX=OFF \
4864
-DBOOST_LOCALE_ENABLE_WINAPI=ON \

.github/workflows/advanced.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1097,6 +1097,28 @@ jobs:
10971097
# run: |
10981098
# .github/scripts/ffmpeg/execute-tests.sh
10991099

1100+
1101+
build-x64-boost:
1102+
runs-on: [ubuntu-latest]
1103+
1104+
env:
1105+
BOOST_PATH: ${{ github.workspace }}/boost
1106+
1107+
steps:
1108+
- name: Checkout repository
1109+
uses: actions/checkout@v4
1110+
with:
1111+
path: ${{ github.workspace }}
1112+
1113+
- name: Checkout Boost
1114+
run: |
1115+
.github/scripts/boost/checkout.sh
1116+
1117+
- name: Build Boost
1118+
run: |
1119+
.github/scripts/boost/build.sh true
1120+
1121+
11001122
build-boost:
11011123
needs: [build-toolchain]
11021124
runs-on: [Linux, x64, GCC, D2ds_v6]
@@ -1133,7 +1155,7 @@ jobs:
11331155
11341156
- name: Build Boost
11351157
run: |
1136-
.github/scripts/boost/build.sh
1158+
.github/scripts/boost/build.sh false
11371159
11381160
- name: Pack Boost tests
11391161
run: |

0 commit comments

Comments
 (0)