Skip to content

Commit 70d54ad

Browse files
authored
ci: Build for ubuntu, macos and windows
1 parent 7f3dedb commit 70d54ad

2 files changed

Lines changed: 50 additions & 17 deletions

File tree

.github/workflows/build.yml

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
name: Build
22

33
on:
4+
push:
45
pull_request:
56
repository_dispatch:
67
types: [run_build]
78

89
jobs:
9-
build:
10+
build-linux:
1011
runs-on: ubuntu-latest
1112
container: ubuntu:14.04
1213
steps:
@@ -30,5 +31,51 @@ jobs:
3031
if: ${{ success() }}
3132
uses: actions/upload-artifact@v2
3233
with:
33-
name: vitasdk.tar.bz2
34+
name: vitasdk-linux
35+
path: build/*.tar.bz2
36+
build-macos:
37+
runs-on: macos-10.15
38+
steps:
39+
- uses: actions/checkout@v2
40+
- name: Build
41+
run: |
42+
git config --global user.email "builds@travis-ci.com"
43+
git config --global user.name "Travis CI"
44+
mkdir build
45+
cd build
46+
cmake ..
47+
make -j$(nproc) tarball
48+
- name: Upload artifacts
49+
if: ${{ success() }}
50+
uses: actions/upload-artifact@v2
51+
with:
52+
name: vitasdk-macos
53+
path: build/*.tar.bz2
54+
build-windows:
55+
runs-on: ubuntu-latest
56+
container: ubuntu:14.04
57+
steps:
58+
- uses: actions/checkout@v2
59+
- name: Install dependencies
60+
run: |
61+
sudo apt-get update
62+
sudo apt-get install -y software-properties-common
63+
sudo add-apt-repository ppa:george-edison55/cmake-3.x
64+
sudo apt-get update
65+
sudo apt-get install -y cmake cmake-data git build-essential autoconf texinfo bison flex pkg-config g++-mingw-w64
66+
- name: Build
67+
run: |
68+
git config --global user.email "builds@travis-ci.com"
69+
git config --global user.name "Travis CI"
70+
unset CXX
71+
unset CC
72+
mkdir build
73+
cd build
74+
cmake .. -DCMAKE_TOOLCHAIN_FILE=toolchain-x86_64-w64-mingw32.cmake
75+
make -j$(nproc) tarball
76+
- name: Upload artifacts
77+
if: ${{ success() }}
78+
uses: actions/upload-artifact@v2
79+
with:
80+
name: vitasdk-windows
3481
path: build/*.tar.bz2

CMakeLists.txt

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ function(toolchain_deps toolchain_deps_dir toolchain_install_dir toolchain_suffi
186186
URL_HASH ${LIBELF_HASH}
187187
DOWNLOAD_DIR ${DOWNLOAD_DIR}
188188
PATCH_COMMAND patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/libelf.patch
189-
CONFIGURE_COMMAND CC=${cc_compiler} RANLIB=${ranlib} ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
189+
CONFIGURE_COMMAND autoreconf -i <SOURCE_DIR> COMMAND CC=${cc_compiler} RANLIB=${ranlib} ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
190190
--build=${build_native}
191191
--host=${toolchain_host}
192192
--prefix=${toolchain_deps_dir}
@@ -294,8 +294,6 @@ function(toolchain_deps toolchain_deps_dir toolchain_install_dir toolchain_suffi
294294
${UPDATE_DISCONNECTED_SUPPORT}
295295
)
296296

297-
fix_repo_update(vita-toolchain${suffix})
298-
299297
ExternalProject_Add(binutils${suffix}
300298
URL https://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VERSION}.tar.xz
301299
URL_HASH ${BINUTILS_HASH}
@@ -516,8 +514,6 @@ ExternalProject_add(vita-headers
516514
${UPDATE_DISCONNECTED_SUPPORT}
517515
)
518516

519-
fix_repo_update(vita-headers)
520-
521517
ExternalProject_Add(newlib
522518
DEPENDS binutils_${target_suffix} gcc-base vita-headers
523519
GIT_REPOSITORY https://github.com/vitasdk/newlib
@@ -545,8 +541,6 @@ ExternalProject_Add(newlib
545541
${UPDATE_DISCONNECTED_SUPPORT}
546542
)
547543

548-
fix_repo_update(newlib)
549-
550544
# Build a complete gcc compiler to be able to compile the full gcc for the host when crosscompiling.
551545
# Using gcc-base doesn't work since is missing some headers.
552546
if(CMAKE_TOOLCHAIN_FILE)
@@ -602,8 +596,6 @@ ExternalProject_Add(pthread-embedded
602596
${UPDATE_DISCONNECTED_SUPPORT}
603597
)
604598

605-
fix_repo_update(pthread-embedded)
606-
607599
ExternalProject_add(gcc-final
608600
DEPENDS gmp_${target_suffix} mpfr_${target_suffix} mpc_${target_suffix} isl_${target_suffix} libelf_${target_suffix}
609601
DEPENDS newlib ${GCC_DEPENDS} pthread-embedded
@@ -656,8 +648,6 @@ ExternalProject_Add(samples
656648
${UPDATE_DISCONNECTED_SUPPORT}
657649
)
658650

659-
fix_repo_update(samples)
660-
661651
ExternalProject_Add(vdpm
662652
GIT_REPOSITORY https://github.com/vitasdk/vdpm.git
663653
GIT_TAG ${VDPM_TAG}
@@ -672,8 +662,6 @@ ExternalProject_Add(vdpm
672662
${UPDATE_DISCONNECTED_SUPPORT}
673663
)
674664

675-
fix_repo_update(vdpm)
676-
677665
ExternalProject_Add(vita-makepkg
678666
GIT_REPOSITORY https://github.com/vitasdk/vita-makepkg.git
679667
GIT_TAG ${VITA_MAKEPKG_TAG}
@@ -688,8 +676,6 @@ ExternalProject_Add(vita-makepkg
688676
${UPDATE_DISCONNECTED_SUPPORT}
689677
)
690678

691-
fix_repo_update(vita-makepkg)
692-
693679
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
694680
getgcclib(libwinpthread-1.dll WINPTHREAD_DLL)
695681
if(WINPTHREAD_DLL)

0 commit comments

Comments
 (0)