From 7967da22b9e232fd3029e268e0feb3dbb285bba7 Mon Sep 17 00:00:00 2001 From: belliash Date: Fri, 22 Jul 2022 22:51:45 +0200 Subject: [PATCH 1/8] Use bash --- .build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build.yml b/.build.yml index b63e468..4ce8f88 100644 --- a/.build.yml +++ b/.build.yml @@ -2,4 +2,4 @@ pipeline: build: image: codingworkshop/oscw-runner:latest commands: - - sh build-linux.sh + - bash build-linux.sh -- 2.45.1 From 4013b2546287e68b7c6488de47f07d7154423edd Mon Sep 17 00:00:00 2001 From: belliash Date: Fri, 22 Jul 2022 22:52:45 +0200 Subject: [PATCH 2/8] Allow xtchain to be built by root --- build-linux.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build-linux.sh b/build-linux.sh index b03ad90..00fee59 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -507,12 +507,6 @@ xtchain_build() # Exit immediately on any failure set -e -# Check if script launched as root -if [ "$(whoami)" = "root" ]; then - echo "This script cannot be run as root!" - exit 1 -fi - # Check number of CPU cores available : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)} : ${CORES:=$(nproc 2>/dev/null)} -- 2.45.1 From 14ca87ff2b13cdd1e9fee4fc5e16b92ab586ede6 Mon Sep 17 00:00:00 2001 From: belliash Date: Sat, 23 Jul 2022 00:15:58 +0200 Subject: [PATCH 3/8] Rebuild hash table --- .build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.build.yml b/.build.yml index 4ce8f88..fe319a5 100644 --- a/.build.yml +++ b/.build.yml @@ -2,4 +2,5 @@ pipeline: build: image: codingworkshop/oscw-runner:latest commands: + - bash hash -r - bash build-linux.sh -- 2.45.1 From 6ba904d84e32063459dbe89e158cd398e5bbb8c9 Mon Sep 17 00:00:00 2001 From: belliash Date: Sat, 23 Jul 2022 00:19:46 +0200 Subject: [PATCH 4/8] Revert latest commit --- .build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.build.yml b/.build.yml index fe319a5..4ce8f88 100644 --- a/.build.yml +++ b/.build.yml @@ -2,5 +2,4 @@ pipeline: build: image: codingworkshop/oscw-runner:latest commands: - - bash hash -r - bash build-linux.sh -- 2.45.1 From ae00ff07a177ea653d348329a8fd177361c71baf Mon Sep 17 00:00:00 2001 From: belliash Date: Sat, 23 Jul 2022 01:01:58 +0200 Subject: [PATCH 5/8] Simply launch building script --- .build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build.yml b/.build.yml index 4ce8f88..2d8825c 100644 --- a/.build.yml +++ b/.build.yml @@ -2,4 +2,4 @@ pipeline: build: image: codingworkshop/oscw-runner:latest commands: - - bash build-linux.sh + - ./build-linux.sh -- 2.45.1 From bfa6974cfcaa42501aba0edbaf7eac600a578be8 Mon Sep 17 00:00:00 2001 From: belliash Date: Sat, 23 Jul 2022 16:53:39 +0200 Subject: [PATCH 6/8] Allow to limit number of cores used for compilation --- .build.yml | 2 +- build-linux.sh | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.build.yml b/.build.yml index 2d8825c..9f341cb 100644 --- a/.build.yml +++ b/.build.yml @@ -2,4 +2,4 @@ pipeline: build: image: codingworkshop/oscw-runner:latest commands: - - ./build-linux.sh + - CORES=8 ./build-linux.sh diff --git a/build-linux.sh b/build-linux.sh index 00fee59..50c1364 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -508,9 +508,11 @@ xtchain_build() set -e # Check number of CPU cores available -: ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)} -: ${CORES:=$(nproc 2>/dev/null)} -: ${CORES:=1} +if [[ ! -n ${CORES} ]]; then + : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)} + : ${CORES:=$(nproc 2>/dev/null)} + : ${CORES:=1} +fi # Create working directories mkdir -p ${BINDIR} -- 2.45.1 From 9a4d71c212d0cd7b170eb2f17ec996f910005469 Mon Sep 17 00:00:00 2001 From: belliash Date: Sun, 24 Jul 2022 14:53:24 +0200 Subject: [PATCH 7/8] Disable freetype support --- build-linux.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build-linux.sh b/build-linux.sh index 50c1364..09ca532 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -448,6 +448,7 @@ wine_build() cd ${WINEDIR}/build ../configure \ -enable-win64 \ + --without-freetype \ --without-x for TOOL in winedump wmc wrc; do make -j${CORES} tools/${TOOL}/all -- 2.45.1 From cf0207e2106b8bbe1ca773e2ac526681e3be75b0 Mon Sep 17 00:00:00 2001 From: belliash Date: Mon, 25 Jul 2022 10:06:08 +0200 Subject: [PATCH 8/8] Automatically publish new release --- .build.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.build.yml b/.build.yml index 9f341cb..8d74cd1 100644 --- a/.build.yml +++ b/.build.yml @@ -2,4 +2,13 @@ pipeline: build: image: codingworkshop/oscw-runner:latest commands: - - CORES=8 ./build-linux.sh + - CORES=10 ./build-linux.sh + publish: + image: codingworkshop/oscw-runner:latest + secrets: + - OSCW_GITHUB_USERNAME + - OSCW_GITHUB_PASSWORD + when: + event: tag + commands: + - github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst) -- 2.45.1