levogevo/ffmpeg-builder
1
0
Fork 0
mirror of https://github.com/levogevo/ffmpeg-builder.git synced 2026-01-15 19:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix label and don't wipe prefix

Browse Source
This commit is contained in:
Levon Gevorgyan
2025-08-17 18:38:54 -05:00
parent 559ef5583e
commit f3ff751430
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@@ -44,7 +44,7 @@ pipeline {
'archlinux-latest' 'archlinux-latest'
} }
axis { axis {
name 'ARCH' name 'LABEL_ARCH'
values 'arm64', 'amd64' values 'arm64', 'amd64'
} }
axis { axis {
@@ -60,7 +60,7 @@ pipeline {
} }
stages { stages {
stage('Run Multiarch Image') { stage('Run Multiarch Image') {
agent { label "linux && ${ARCH}" } agent { label "linux && ${LABEL_ARCH}" }
steps { steps {
withCredentials([string( withCredentials([string(
credentialsId: 'DOCKER_REGISTRY', credentialsId: 'DOCKER_REGISTRY',

2
lib/build.sh
View File

@@ -329,6 +329,7 @@ build() {
set_compile_opts || return 1 set_compile_opts || return 1
# check if we need to install with sudo # check if we need to install with sudo
test -d "${PREFIX}" || mkdir -p "${PREFIX}"
unset SUDO_MODIFY unset SUDO_MODIFY
testfile="${PREFIX}/ffmpeg-build-testfile" testfile="${PREFIX}/ffmpeg-build-testfile"
if touch "${testfile}" 2>/dev/null; then if touch "${testfile}" 2>/dev/null; then
@@ -338,7 +339,6 @@ build() {
${SUDO_MODIFY} mkdir -p "${PREFIX}/bin/" || return 1 ${SUDO_MODIFY} mkdir -p "${PREFIX}/bin/" || return 1
fi fi
test -f "${testfile}" && ${SUDO_MODIFY} rm "${testfile}" test -f "${testfile}" && ${SUDO_MODIFY} rm "${testfile}"
test -d "${PREFIX}" && ${SUDO_MODIFY} rm -rf "${PREFIX}"
test -d "${PREFIX}/bin/" || { ${SUDO_MODIFY} mkdir -p "${PREFIX}/bin/" || return 1; } test -d "${PREFIX}/bin/" || { ${SUDO_MODIFY} mkdir -p "${PREFIX}/bin/" || return 1; }
# embed this project's enables/versions # embed this project's enables/versions