-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix x86 build in actions to use i386 ICU package
Signed-off-by: HyukWoo Park <[email protected]>
- Loading branch information
1 parent
ff7b027
commit 081e241
Showing
1 changed file
with
13 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,7 +34,7 @@ jobs: | |
| - name: Install Packages | ||
| run: | | ||
| brew update | ||
| brew install cmake ninja pkg-config icu4c@75 | ||
| brew install ninja pkg-config icu4c@75 | ||
| - name: Build x64 | ||
| env: | ||
| BUILD_OPTIONS: -DESCARGOT_WASM=ON -DESCARGOT_TEMPORAL=ON -DESCARGOT_TCO=ON -DESCARGOT_TEST=ON -DESCARGOT_OUTPUT=shell -GNinja | ||
|
|
@@ -61,7 +61,7 @@ jobs: | |
| - name: Install Packages | ||
| run: | | ||
| brew update | ||
| brew install cmake ninja pkg-config icu4c@75 | ||
| brew install ninja pkg-config icu4c@75 | ||
| - name: Build arm64 | ||
| env: | ||
| BUILD_OPTIONS: -DESCARGOT_WASM=ON -DESCARGOT_TEMPORAL=ON -DESCARGOT_TCO=ON -DESCARGOT_TEST=ON -DESCARGOT_OUTPUT=shell -GNinja | ||
|
|
@@ -92,7 +92,7 @@ jobs: | |
| - name: Install Packages | ||
| run: | | ||
| brew update | ||
| brew install cmake pkg-config | ||
| brew install pkg-config | ||
| - name: Set up JDK | ||
| uses: actions/[email protected] | ||
| with: | ||
|
|
@@ -292,6 +292,7 @@ jobs: | |
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install -y ninja-build gcc-multilib g++-multilib python2 | ||
| # set python2 | ||
| sudo update-alternatives --install /usr/bin/python python /usr/bin/python2 1 | ||
| - name: Install ICU | ||
| run: | | ||
|
|
@@ -314,7 +315,6 @@ jobs: | |
| uses: mxschmitt/action-tmate@v3 | ||
| timeout-minutes: 15 | ||
|
|
||
|
|
||
| build-test-on-x64-release: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
|
|
@@ -361,26 +361,17 @@ jobs: | |
| submodules: true | ||
| - name: Install Packages | ||
| run: | | ||
| # for i386 ICU | ||
| sudo dpkg --add-architecture i386 | ||
| sudo apt-get update | ||
| sudo apt-get install -y ninja-build gcc-multilib g++-multilib | ||
| - name: Install ICU | ||
| run: | | ||
| wget http://mirrors.kernel.org/ubuntu/pool/main/i/icu/libicu-dev_70.1-2ubuntu1_i386.deb | ||
| dpkg -X libicu-dev_70.1-2ubuntu1_i386.deb $GITHUB_WORKSPACE/icu32 | ||
| wget http://mirrors.kernel.org/ubuntu/pool/main/i/icu/libicu-dev_70.1-2ubuntu1_amd64.deb | ||
| dpkg -X libicu-dev_70.1-2ubuntu1_amd64.deb $GITHUB_WORKSPACE/icu64 | ||
| sudo apt-get install -y libicu-dev:i386 # install i386 ICU | ||
| - name: Build x86/x64 | ||
| env: | ||
| BUILD_OPTIONS_X86: -DESCARGOT_MODE=debug -DESCARGOT_TEMPORAL=ON -DESCARGOT_TCO=ON -DESCARGOT_TEST=ON -DESCARGOT_LIBICU_SUPPORT_WITH_DLOPEN=OFF -DESCARGOT_OUTPUT=shell -GNinja | ||
| BUILD_OPTIONS_X86: -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=x86 -DESCARGOT_MODE=debug -DESCARGOT_TEMPORAL=ON -DESCARGOT_TCO=ON -DESCARGOT_TEST=ON -DESCARGOT_OUTPUT=shell -GNinja | ||
| BUILD_OPTIONS_X64: -DESCARGOT_MODE=debug -DESCARGOT_TEMPORAL=ON -DESCARGOT_TCO=ON -DESCARGOT_TEST=ON -DESCARGOT_OUTPUT=shell -GNinja | ||
| run: | | ||
| export CXXFLAGS="-I$GITHUB_WORKSPACE/icu32/usr/include" | ||
| export LDFLAGS="-L$GITHUB_WORKSPACE/icu32/usr/lib/i386-linux-gnu -Wl,-rpath=$GITHUB_WORKSPACE/icu32/usr/lib/i386-linux-gnu" | ||
| export PKG_CONFIG_PATH=$GITHUB_WORKSPACE/icu32/usr/lib/i386-linux-gnu/pkgconfig | ||
| cmake -H. -Bout/debug/x86 $BUILD_OPTIONS_X86 | ||
| export CXXFLAGS="-I$GITHUB_WORKSPACE/icu64/usr/include" | ||
| export LDFLAGS="-L$GITHUB_WORKSPACE/icu64/usr/lib/x86_64-linux-gnu -Wl,-rpath=$GITHUB_WORKSPACE/icu64/usr/lib/x86_64-linux-gnu" | ||
| export PKG_CONFIG_PATH=$GITHUB_WORKSPACE/icu64/usr/lib/x86_64-linux-gnu/pkgconfig | ||
| cmake -H. -Bout/debug/x64 $BUILD_OPTIONS_X64 | ||
| ninja -Cout/debug/x86 | ||
| ninja -Cout/debug/x64 | ||
|
|
@@ -479,7 +470,7 @@ jobs: | |
| sudo apt-get install -y ninja-build gcc-multilib g++-multilib | ||
| - name: Build x86/x64 | ||
| env: | ||
| BUILD_OPTIONS_X86: -DCMAKE_SYSTEM_PROCESSOR=x86 -DESCARGOT_MODE=debug -DESCARGOT_THREADING=ON -DESCARGOT_DEBUGGER=1 -DESCARGOT_USE_EXTENDED_API=ON -DESCARGOT_TEST=ON -DESCARGOT_OUTPUT=cctest -GNinja | ||
| BUILD_OPTIONS_X86: -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=x86 -DESCARGOT_MODE=debug -DESCARGOT_THREADING=ON -DESCARGOT_DEBUGGER=1 -DESCARGOT_USE_EXTENDED_API=ON -DESCARGOT_TEST=ON -DESCARGOT_OUTPUT=cctest -GNinja | ||
| BUILD_OPTIONS_X64: -DESCARGOT_MODE=debug -DESCARGOT_THREADING=1 -DESCARGOT_DEBUGGER=1 -DESCARGOT_USE_EXTENDED_API=ON -DESCARGOT_TEST=ON -DESCARGOT_OUTPUT=cctest -GNinja | ||
| run: | | ||
| cmake -H. -Bout/cctest/x86 $BUILD_OPTIONS_X86 | ||
|
|
@@ -499,39 +490,27 @@ jobs: | |
| submodules: true | ||
| - name: Install Packages | ||
| run: | | ||
| # for i386 ICU | ||
| sudo dpkg --add-architecture i386 | ||
| sudo apt-get update | ||
| sudo apt-get install -y ninja-build gcc-multilib g++-multilib | ||
| - name: Install ICU | ||
| run: | | ||
| wget http://mirrors.kernel.org/ubuntu/pool/main/i/icu/libicu-dev_70.1-2ubuntu1_i386.deb | ||
| dpkg -X libicu-dev_70.1-2ubuntu1_i386.deb $GITHUB_WORKSPACE/icu32 | ||
| wget http://mirrors.kernel.org/ubuntu/pool/main/i/icu/libicu-dev_70.1-2ubuntu1_amd64.deb | ||
| dpkg -X libicu-dev_70.1-2ubuntu1_amd64.deb $GITHUB_WORKSPACE/icu64 | ||
| sudo apt-get install -y libicu-dev:i386 # install i386 ICU | ||
| - name: Build x86 | ||
| env: | ||
| BUILD_OPTIONS: -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=x86 -DESCARGOT_MODE=debug -DESCARGOT_LIBICU_SUPPORT_WITH_DLOPEN=OFF -DESCARGOT_CODE_CACHE=ON -DESCARGOT_TEMPORAL=ON -DESCARGOT_TCO=ON -DESCARGOT_TEST=ON -DESCARGOT_OUTPUT=shell -GNinja | ||
| BUILD_OPTIONS: -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=x86 -DESCARGOT_MODE=debug -DESCARGOT_CODE_CACHE=ON -DESCARGOT_TEMPORAL=ON -DESCARGOT_TCO=ON -DESCARGOT_TEST=ON -DESCARGOT_OUTPUT=shell -GNinja | ||
| run: | | ||
| export CXXFLAGS="-I$GITHUB_WORKSPACE/icu32/usr/include" | ||
| export LDFLAGS="-L$GITHUB_WORKSPACE/icu32/usr/lib/i386-linux-gnu -Wl,-rpath=$GITHUB_WORKSPACE/icu32/usr/lib/i386-linux-gnu" | ||
| export PKG_CONFIG_PATH=$GITHUB_WORKSPACE/icu32/usr/lib/i386-linux-gnu/pkgconfig | ||
| cmake -H. -Bout/codecache/x86 $BUILD_OPTIONS | ||
| ninja -Cout/codecache/x86 | ||
| - name: Build x64 | ||
| env: | ||
| BUILD_OPTIONS: -DESCARGOT_MODE=debug -DESCARGOT_CODE_CACHE=ON -DESCARGOT_TEMPORAL=ON -DESCARGOT_TCO=ON -DESCARGOT_TEST=ON -DESCARGOT_OUTPUT=shell -GNinja | ||
| run: | | ||
| export CXXFLAGS="-I$GITHUB_WORKSPACE/icu64/usr/include" | ||
| export LDFLAGS="-L$GITHUB_WORKSPACE/icu64/usr/lib/x86_64-linux-gnu -Wl,-rpath=$GITHUB_WORKSPACE/icu64/usr/lib/x86_64-linux-gnu" | ||
| export PKG_CONFIG_PATH=$GITHUB_WORKSPACE/icu64/usr/lib/x86_64-linux-gnu/pkgconfig | ||
| cmake -H. -Bout/codecache/x64 $BUILD_OPTIONS | ||
| ninja -Cout/codecache/x64 | ||
| - name: Build x64 Release Mode | ||
| env: | ||
| BUILD_OPTIONS: -DESCARGOT_MODE=release -DESCARGOT_CODE_CACHE=ON -DESCARGOT_TEMPORAL=ON -DESCARGOT_TCO=ON -DESCARGOT_TEST=ON -DESCARGOT_OUTPUT=shell -GNinja | ||
| run: | | ||
| export CXXFLAGS="-I$GITHUB_WORKSPACE/icu64/usr/include" | ||
| export LDFLAGS="-L$GITHUB_WORKSPACE/icu64/usr/lib/x86_64-linux-gnu -Wl,-rpath=$GITHUB_WORKSPACE/icu64/usr/lib/x86_64-linux-gnu" | ||
| export PKG_CONFIG_PATH=$GITHUB_WORKSPACE/icu64/usr/lib/x86_64-linux-gnu/pkgconfig | ||
| cmake -H. -Bout/codecache/release/x64 $BUILD_OPTIONS | ||
| ninja -Cout/codecache/release/x64 | ||
| - name: Run x86 test | ||
|
|
||