mirrors/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2025-01-22 09:11:50 -05:00
Code Issues Projects Releases Packages Wiki Activity

Jenkins: Don't include manifest in branch builds

Browse source
This commit is contained in:
RichardG867 2024-09-03 14:23:56 -03:00
parent c5177bf514
commit 4db6fd4a89
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.ci/Jenkinsfile vendored
View file

@ -20,6 +20,7 @@ def repository = ['https://github.com/86Box/86Box.git', scm.userRemoteConfigs[0]
def commitBrowser = ['https://github.com/86Box/86Box/commit/%s', null] def commitBrowser = ['https://github.com/86Box/86Box/commit/%s', null]
def branch = ['master', scm.branches[0].name] def branch = ['master', scm.branches[0].name]
def buildType = ['beta', 'alpha'] def buildType = ['beta', 'alpha']
def tarballFlags = ['', '-s']
def buildBranch = env.JOB_BASE_NAME.contains('-') ? 1 : 0 def buildBranch = env.JOB_BASE_NAME.contains('-') ? 1 : 0
def osArchs = [ def osArchs = [
@ -238,7 +239,7 @@ pipeline {
dir("${env.WORKSPACE_TMP}/output") { dir("${env.WORKSPACE_TMP}/output") {
/* Run source tarball creation process. */ /* Run source tarball creation process. */
def packageName = "${env.JOB_BASE_NAME}-Source$buildSuffix" def packageName = "${env.JOB_BASE_NAME}-Source$buildSuffix"
if (runBuild("-s \"$packageName\"") == 0) { if (runBuild("-s \"$packageName\" ${tarballFlags[buildBranch]}") == 0) {
/* Archive resulting artifacts. */ /* Archive resulting artifacts. */
archiveArtifacts artifacts: "$packageName*" archiveArtifacts artifacts: "$packageName*"
} else { } else {

9
.ci/build.sh
View file

@ -208,7 +208,7 @@ cmake_flags_extra=
if [ -z "$package_name" -a -z "$tarball_name" ] || [ -n "$package_name" -a -z "$arch" ] if [ -z "$package_name" -a -z "$tarball_name" ] || [ -n "$package_name" -a -z "$arch" ]
then then
echo '[!] Usage: build.sh -b {package_name} {architecture} [-t] [cmake_flags...]' echo '[!] Usage: build.sh -b {package_name} {architecture} [-t] [cmake_flags...]'
echo ' build.sh -s {source_tarball_name}' echo ' build.sh -s {source_tarball_name} [-t]'
echo 'Dep. tree: build.sh -p [archive_tmp/path/to/binary]' echo 'Dep. tree: build.sh -p [archive_tmp/path/to/binary]'
exit 100 exit 100
fi fi
@ -228,7 +228,10 @@ then
[ ! -d "$cwd" ] && mkdir -p "$cwd" [ ! -d "$cwd" ] && mkdir -p "$cwd"
# Save current HEAD commit to VERSION. # Save current HEAD commit to VERSION.
git log --stat -1 > VERSION || rm -f VERSION if [ $strip -eq 0 ]
then
git log --stat -1 > VERSION || rm -f VERSION
fi
# Archive source. # Archive source.
make_tar "$cwd/$tarball_name.tar" make_tar "$cwd/$tarball_name.tar"
@ -537,7 +540,7 @@ then
fi fi
# Patch wget to remove libproxy support, as it depends on shared-mime-info which # Patch wget to remove libproxy support, as it depends on shared-mime-info which
# fails to build for a 10.14 target, which we have to do despite wget only being # fails to build for a 10.13 target, which we have to do despite wget only being
# a host dependency. MacPorts issue 69406 strongly implies this will not be fixed. # a host dependency. MacPorts issue 69406 strongly implies this will not be fixed.
wget_portfile="$macports/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/net/wget/Portfile" wget_portfile="$macports/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/net/wget/Portfile"
sudo sed -i -e 's/--enable-libproxy/--disable-libproxy/g' "$wget_portfile" sudo sed -i -e 's/--enable-libproxy/--disable-libproxy/g' "$wget_portfile"