test older conan

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 \
+    /tmp/audacity.tar.gz -L \
-    "https://github.com/audacity/audacity/releases/download/Audacity-${AUDACITY_VERSION}/audacity-minsrc-${AUDACITY_VERSION}.tar.xz" && \
+    "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 \

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 \
+    /tmp/audacity.tar.gz -L \
-    "https://github.com/audacity/audacity/releases/download/Audacity-${AUDACITY_VERSION}/audacity-minsrc-${AUDACITY_VERSION}.tar.xz" && \
+    "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 \

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==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" \
@@ -22,10 +26,10 @@ RUN \
   fi && \
   mkdir -p /app/audacity/build && \
   curl -o \
-    /tmp/audacity.tar.xz -L \
+    /tmp/audacity.tar.gz -L \
-    "https://github.com/audacity/audacity/releases/download/Audacity-${AUDACITY_VERSION}/audacity-minsrc-${AUDACITY_VERSION}.tar.xz" && \
+    "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 \

Jenkinsfile

@@ -431,7 +431,7 @@ pipeline {
         }
         stage('Build ARMHF') {
           agent {
-            label 'ARMHF'
+            label 'ARMHF-NATIVE'
           }
           steps {
             echo "Running on node: ${NODE_NAME}"

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.

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'

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." }