diff --git a/.github/workflows/bootstrap-deps.sh b/.github/workflows/bootstrap-deps.sh index 0ad73e4..670e34d 100755 --- a/.github/workflows/bootstrap-deps.sh +++ b/.github/workflows/bootstrap-deps.sh @@ -16,7 +16,6 @@ function get_linux_deb_arch() { "linux-i686") echo "i386" ;; "linux-riscv64") echo "riscv64" ;; "linux-x86_64") echo "amd64" ;; - "win32"|"win64") echo "i386" ;; esac } @@ -43,9 +42,13 @@ function install_compiler() { cd ~/PawPawBuilds/emsdk && ./emsdk install ${EMSCRIPTEN_VERSION} && ./emsdk activate ${EMSCRIPTEN_VERSION} ;; "win32") + dpkg --add-architecture i386 + apt-get update -qq apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable ;; "win64") + dpkg --add-architecture i386 + apt-get update -qq apt-get install -yqq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable ;; esac diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 32fe54d..cd7c090 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -20,9 +20,9 @@ jobs: - target: linux-armhf os: ubuntu-latest container: ubuntu:22.04 - - target: linux-i686 - os: ubuntu-latest - container: ubuntu:22.04 + #- target: linux-i686 + #os: ubuntu-latest + #container: ubuntu:22.04 - target: linux-riscv64 os: ubuntu-latest container: ubuntu:22.04