Browse Source

Start a wasm CI target

Signed-off-by: falkTX <falktx@falktx.com>
pull/28/head
falkTX 2 years ago
parent
commit
c8d0ac9d8c
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 15 additions and 2 deletions
  1. +12
    -0
      .github/workflows/bootstrap.yml
  2. +0
    -1
      setup/check_target.sh
  3. +3
    -1
      setup/functions.sh

+ 12
- 0
.github/workflows/bootstrap.yml View File

@@ -29,6 +29,10 @@ jobs:
installer: homebrew
os: macos-10.15
target: macos-universal
- name: wasm
installer: apt
os: ubuntu-20.04
target: wasm
- name: win32
installer: apt
os: ubuntu-20.04
@@ -67,6 +71,11 @@ jobs:
if [ '${{ matrix.target }}' == 'linux' ]; then \
sudo apt-get install -yqq libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev; \
fi
# extra, for wasm
if [ '${{ matrix.target }}' == 'wasm' ]; then \
git clone https://github.com/emscripten-core/emsdk.git; \
cd emsdk && ./emsdk install latest && ./emsdk activate latest; \
fi
# extra, for win32
if [ '${{ matrix.target }}' == 'win32' ]; then \
sudo dpkg --add-architecture i386; \
@@ -95,6 +104,9 @@ jobs:
- name: Run bootstrap
shell: bash
run: |
if [ '${{ matrix.target }}' == 'wasm' ]; then \
source ./emsdk/emsdk_env.sh; \
fi
./bootstrap-common.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }}
- name: Pack bootstrap build
shell: bash


+ 0
- 1
setup/check_target.sh View File

@@ -22,7 +22,6 @@ function check_target() {
WASM=1
CROSS_COMPILING=1
PAWPAW_SKIP_FORTIFY=1
PAWPAW_SKIP_LTO=1
;;
"win32"|"MINGW32"*)
WIN32=1


+ 3
- 1
setup/functions.sh View File

@@ -193,7 +193,9 @@ function build_autoconf() {

local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}"

if [ "${CROSS_COMPILING}" -eq 1 ]; then
if [ "${WASM}" -eq 1 ]; then
extraconfrules="--host=x86_64-linux-gnu ${extraconfrules}"
elif [ "${CROSS_COMPILING}" -eq 1 ]; then
extraconfrules="--host=${TOOLCHAIN_PREFIX} ${extraconfrules}"
fi



Loading…
Cancel
Save