From b282abbd4a8914646e5c3dc0d43a3d674e4f8b89 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 14 Sep 2021 14:52:38 -0400 Subject: [PATCH 1/4] fix builds (build from release tarballs) --- Dockerfile | 14 +++++++++----- Dockerfile.aarch64 | 14 +++++++++----- Dockerfile.armhf | 14 +++++++++----- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 29 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index e0ffcb0..09ab95b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,11 @@ RUN \ libasound2-dev \ libavformat-dev \ libgtk2.0-dev \ - libjack-jackd2-dev && \ + libjack-jackd2-dev \ + python3-dev \ + python3-pip && \ + pip3 install -U pip && \ + pip install conan && \ echo "**** build audacity ****" && \ if [ -z ${AUDACITY_VERSION+x} ]; then \ AUDACITY_VERSION=$(curl -sX GET "https://api.github.com/repos/audacity/audacity/releases/latest" \ @@ -22,10 +26,10 @@ RUN \ fi && \ mkdir -p /app/audacity/build && \ curl -o \ - /tmp/audacity.tar.xz -L \ - "https://github.com/audacity/audacity/releases/download/Audacity-${AUDACITY_VERSION}/audacity-minsrc-${AUDACITY_VERSION}.tar.xz" && \ + /tmp/audacity.tar.gz -L \ + "https://github.com/audacity/audacity/archive/refs/tags/Audacity-${AUDACITY_VERSION}.tar.gz" && \ tar xf \ - /tmp/audacity.tar.xz -C \ + /tmp/audacity.tar.gz -C \ /app/audacity --strip-components=1 && \ cd /app/audacity/build && \ cmake -DCMAKE_BUILD_TYPE=Release -Daudacity_use_wxwidgets=local -Daudacity_use_ffmpeg=loaded .. && \ @@ -33,7 +37,7 @@ RUN \ make install && \ echo "**** cleanup ****" && \ apt-get purge --auto-remove -y \ - build-essential \ + build-essential \ cmake \ curl \ gcc \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index acc9425..dfe1608 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -14,7 +14,11 @@ RUN \ libasound2-dev \ libavformat-dev \ libgtk2.0-dev \ - libjack-jackd2-dev && \ + libjack-jackd2-dev \ + python3-dev \ + python3-pip && \ + pip3 install -U pip && \ + pip install conan && \ echo "**** build audacity ****" && \ if [ -z ${AUDACITY_VERSION+x} ]; then \ AUDACITY_VERSION=$(curl -sX GET "https://api.github.com/repos/audacity/audacity/releases/latest" \ @@ -22,10 +26,10 @@ RUN \ fi && \ mkdir -p /app/audacity/build && \ curl -o \ - /tmp/audacity.tar.xz -L \ - "https://github.com/audacity/audacity/releases/download/Audacity-${AUDACITY_VERSION}/audacity-minsrc-${AUDACITY_VERSION}.tar.xz" && \ + /tmp/audacity.tar.gz -L \ + "https://github.com/audacity/audacity/archive/refs/tags/Audacity-${AUDACITY_VERSION}.tar.gz" && \ tar xf \ - /tmp/audacity.tar.xz -C \ + /tmp/audacity.tar.gz -C \ /app/audacity --strip-components=1 && \ cd /app/audacity/build && \ cmake -DCMAKE_BUILD_TYPE=Release -Daudacity_use_wxwidgets=local -Daudacity_use_ffmpeg=loaded .. && \ @@ -33,7 +37,7 @@ RUN \ make install && \ echo "**** cleanup ****" && \ apt-get purge --auto-remove -y \ - build-essential \ + build-essential \ cmake \ curl \ gcc \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 4d1104a..375566e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -14,7 +14,11 @@ RUN \ libasound2-dev \ libavformat-dev \ libgtk2.0-dev \ - libjack-jackd2-dev && \ + libjack-jackd2-dev \ + python3-dev \ + python3-pip && \ + pip3 install -U pip && \ + pip install conan && \ echo "**** build audacity ****" && \ if [ -z ${AUDACITY_VERSION+x} ]; then \ AUDACITY_VERSION=$(curl -sX GET "https://api.github.com/repos/audacity/audacity/releases/latest" \ @@ -22,10 +26,10 @@ RUN \ fi && \ mkdir -p /app/audacity/build && \ curl -o \ - /tmp/audacity.tar.xz -L \ - "https://github.com/audacity/audacity/releases/download/Audacity-${AUDACITY_VERSION}/audacity-minsrc-${AUDACITY_VERSION}.tar.xz" && \ + /tmp/audacity.tar.gz -L \ + "https://github.com/audacity/audacity/archive/refs/tags/Audacity-${AUDACITY_VERSION}.tar.gz" && \ tar xf \ - /tmp/audacity.tar.xz -C \ + /tmp/audacity.tar.gz -C \ /app/audacity --strip-components=1 && \ cd /app/audacity/build && \ cmake -DCMAKE_BUILD_TYPE=Release -Daudacity_use_wxwidgets=local -Daudacity_use_ffmpeg=loaded .. && \ @@ -33,7 +37,7 @@ RUN \ make install && \ echo "**** cleanup ****" && \ apt-get purge --auto-remove -y \ - build-essential \ + build-essential \ cmake \ curl \ gcc \ diff --git a/README.md b/README.md index 4acd80f..8ccdc9f 100644 --- a/README.md +++ b/README.md @@ -225,4 +225,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **14.09.21:** - Fix builds (build from release tarballs). * **07.04.21:** - Initial release. diff --git a/readme-vars.yml b/readme-vars.yml index 6ddeb9e..0733687 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -43,4 +43,5 @@ app_setup_block: | # changelog changelogs: + - { date: "14.09.21:", desc: "Fix builds (build from release tarballs)." } - { date: "07.04.21:", desc: "Initial release." } From 51dcedea65aff7eb50c2e9cd8bbed2e22b489864 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 14 Sep 2021 15:01:14 -0400 Subject: [PATCH 2/4] build armhf on native hw --- Jenkinsfile | 2 +- jenkins-vars.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3c3d463..87b23f5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -431,7 +431,7 @@ pipeline { } stage('Build ARMHF') { agent { - label 'ARMHF' + label 'ARMHF-NATIVE' } steps { echo "Running on node: ${NODE_NAME}" diff --git a/jenkins-vars.yml b/jenkins-vars.yml index c32f9a4..d18f45d 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -7,6 +7,7 @@ custom_version_command: "curl -sX GET https://api.github.com/repos/audacity/auda release_type: stable release_tag: latest ls_branch: main +armhf_native: true repo_vars: - BUILD_VERSION_ARG = 'AUDACITY_VERSION' - LS_USER = 'linuxserver' From 113f9adeeec782127be44af8d0a73d4e0db02c1f Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 14 Sep 2021 15:13:36 -0400 Subject: [PATCH 3/4] generate conan user env --- Dockerfile.armhf | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 375566e..b541837 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -19,6 +19,7 @@ RUN \ python3-pip && \ pip3 install -U pip && \ pip install conan && \ + conan user && \ echo "**** build audacity ****" && \ if [ -z ${AUDACITY_VERSION+x} ]; then \ AUDACITY_VERSION=$(curl -sX GET "https://api.github.com/repos/audacity/audacity/releases/latest" \ From 138aa9d3eeafd4658b82e7bb348fc60ee64dcf8d Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 14 Sep 2021 15:21:25 -0400 Subject: [PATCH 4/4] test older conan --- Dockerfile.armhf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index b541837..5f9b389 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -18,8 +18,7 @@ RUN \ python3-dev \ python3-pip && \ pip3 install -U pip && \ - pip install conan && \ - conan user && \ + pip install conan==1.28.2 && \ echo "**** build audacity ****" && \ if [ -z ${AUDACITY_VERSION+x} ]; then \ AUDACITY_VERSION=$(curl -sX GET "https://api.github.com/repos/audacity/audacity/releases/latest" \