From 9781266a5032f93249c2a67740b98be04f7ef889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A1n=20SDPC?= Date: Tue, 18 Oct 2022 11:34:28 +0200 Subject: [PATCH] fix(cd): target specific ubuntu versions, ensure execution permissions and bundle witnet.toml --- .github/actions/download-releases/action.yml | 9 +++++++-- .github/workflows/master.yml | 4 ++++ .../aarch64-unknown-linux-gnu/Dockerfile | 2 +- .../arm-unknown-linux-gnueabihf/Dockerfile | 2 +- .../armv7-unknown-linux-gnueabihf/Dockerfile | 2 +- .../x86_64-unknown-linux-gnu/Dockerfile | 2 +- docker/witnet-rust/Dockerfile | 2 +- docker/witnet-rust/downloader.sh | 4 ++++ 8 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/actions/download-releases/action.yml b/.github/actions/download-releases/action.yml index d75909441..d4ae86138 100644 --- a/.github/actions/download-releases/action.yml +++ b/.github/actions/download-releases/action.yml @@ -12,8 +12,8 @@ runs: - shell: bash run: | curl "https://raw.githubusercontent.com/witnet/genesis_block/master/latest/genesis_block.json" -o genesis_block.json - cp witnet.toml release/ cp genesis_block.json release/ + cp witnet.toml release/ # Download & Hash Releases # Macos @@ -24,6 +24,7 @@ runs: - shell: bash run: | cp genesis_block.json ./all-releases/macos/ + cp witnet.toml ./all-releases/macos/ cp all-releases/macos/witnet_toolkit release/witnet_toolkit-x86_64-apple-darwin # Windows @@ -34,6 +35,7 @@ runs: - shell: bash run: | cp genesis_block.json ./all-releases/windows/ + cp witnet.toml ./all-releases/windows/ cp all-releases/windows/witnet_toolkit.exe release/witnet_toolkit-x86_64-pc-windows-msvc.exe # x86_64 @@ -44,6 +46,7 @@ runs: - shell: bash run: | cp genesis_block.json ./all-releases/x86_64/ + cp witnet.toml ./all-releases/x86_64/ cp all-releases/x86_64/witnet_toolkit release/witnet_toolkit-x86_64-unknown-linux-gnu # armv7 @@ -54,6 +57,7 @@ runs: - shell: bash run: | cp genesis_block.json ./all-releases/armv7/ + cp witnet.toml ./all-releases/armv7/ cp all-releases/armv7/witnet_toolkit release/witnet_toolkit-armv7-unknown-linux-gnueabihf # aarch64 @@ -64,9 +68,10 @@ runs: - shell: bash run: | cp genesis_block.json ./all-releases/aarch64/ + cp witnet.toml ./all-releases/aarch64/ cp all-releases/aarch64/witnet_toolkit release/witnet_toolkit-aarch64-unknown-linux-gnu - # Copy gensis_block & witnet.toml + # Copy genesis_block & witnet.toml - shell: bash run: | cp genesis_block.json ./release diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index e0d4659f8..eee2c4fd6 100644 --- 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 index efa395f26..4b262f7a1 100644 --- 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 index b633f8a4f..f513de2aa 100644 --- 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 index af14a17e2..4f344bfec 100644 --- 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 index ec9746b9c..fc83400fc 100644 --- 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 index e4d918bfb..0033645bf 100644 --- 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 index 5e3037182..2e614a321 100755 --- 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"