diff --git a/Jenkinsfile b/Jenkinsfile index eef3483..09890ca 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,7 @@ pipeline { 'archlinux-latest' } axis { - name 'ARCH' + name 'LABEL_ARCH' values 'arm64', 'amd64' } axis { @@ -60,7 +60,7 @@ pipeline { } stages { stage('Run Multiarch Image') { - agent { label "linux && ${ARCH}" } + agent { label "linux && ${LABEL_ARCH}" } steps { withCredentials([string( credentialsId: 'DOCKER_REGISTRY', diff --git a/lib/build.sh b/lib/build.sh index e5f92c8..9062e9f 100644 --- a/lib/build.sh +++ b/lib/build.sh @@ -329,6 +329,7 @@ build() { set_compile_opts || return 1 # check if we need to install with sudo + test -d "${PREFIX}" || mkdir -p "${PREFIX}" unset SUDO_MODIFY testfile="${PREFIX}/ffmpeg-build-testfile" if touch "${testfile}" 2>/dev/null; then @@ -338,7 +339,6 @@ build() { ${SUDO_MODIFY} mkdir -p "${PREFIX}/bin/" || return 1 fi 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; } # embed this project's enables/versions