fix(cd): target specific ubuntu versions and ensure execution permiss…

…ions
witnet · Oct 18, 2022 · 6b3142a · 6b3142a
1 parent 376612c
commit 6b3142a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -133,6 +133,10 @@ jobs:
       - name: Building Macos Binary
         run: MACOSX_DEPLOYMENT_TARGET=10.12 OPENSSL_STATIC=1 OPENSSL_DIR="/usr/local/opt/openssl" cargo build --release -p witnet -p witnet_toolkit
 
+      # Ensure that distributable binary files can be executed
+      - name: Make binaries executable
+        run: chmod +x target/release/witnet*
+
       # Upload Build Releases
       - uses: actions/upload-artifact@v3
         with:

diff --git a/docker/cross-compilation/aarch64-unknown-linux-gnu/Dockerfile b/docker/cross-compilation/aarch64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:focal
 
 # Install basic environment dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \

diff --git a/docker/cross-compilation/arm-unknown-linux-gnueabihf/Dockerfile b/docker/cross-compilation/arm-unknown-linux-gnueabihf/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:focal
 
 # Install basic environment dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \

diff --git a/docker/cross-compilation/armv7-unknown-linux-gnueabihf/Dockerfile b/docker/cross-compilation/armv7-unknown-linux-gnueabihf/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:focal
 
 # Install basic environment dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \

diff --git a/docker/cross-compilation/x86_64-unknown-linux-gnu/Dockerfile b/docker/cross-compilation/x86_64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:focal
 
 # Install basic environment dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \

diff --git a/docker/witnet-rust/Dockerfile b/docker/witnet-rust/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$TARGETPLATFORM ubuntu:focal
+FROM --platform=$TARGETPLATFORM ubuntu:jammy
 
 # Install basic environment dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \

diff --git a/docker/witnet-rust/downloader.sh b/docker/witnet-rust/downloader.sh
@@ -16,6 +16,10 @@ if [[ "$TRIPLET" == *"linux"* ]]; then
     TRIPLET=${TRIPLET/pc/unknown}
 fi
 
+if [[ "$TRIPLET" == *"arm-"* ]]; then
+    TRIPLET=${TRIPLET/arm/armv7}
+fi
+
 URL="https://github.com/witnet/witnet-rust/releases/download/$VERSION/witnet-$VERSION-$TRIPLET.tar.gz"
 
 FILENAME="$VERSION.tar.gz"