From 41ee41c126495d2c91bbf2a187b260f0555c0b11 Mon Sep 17 00:00:00 2001 From: badrogger Date: Fri, 15 Nov 2024 19:54:34 +0000 Subject: [PATCH] Fix build --- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 14 ++++++++++---- Dockerfile | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 15407c80..b1ec5612 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,7 +13,7 @@ jobs: create_release: if: github.event.pull_request.merged name: Create release - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} version: ${{ steps.export_outputs.outputs.version }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 35c240e9..6dcd06da 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,16 +36,22 @@ jobs: run: | flake8 . - - name: Build binary in 22.04 environment - normal + - name: Build binary - sync run: | - scripts/build.sh test test normal + mkdir -p ./dist + docker build . -t node-cli-builder + docker run -v /home/ubuntu/dist:/app/dist node-cli-builder scripts/build.sh test test normal + docker rm -f $(docker ps -aq) - name: Check build - normal run: sudo /home/ubuntu/dist/skale-test-Linux-x86_64 - - name: Build sync binary in Ubuntu 22.04 environment + - name: Build binary - sync run: | - scripts/build.sh test test sync + mkdir -p ./dist + docker build . -t node-cli-builder + docker run -v /home/ubuntu/dist:/app/dist node-cli-builder scripts/build.sh test test sync + docker rm -f $(docker ps -aq) - name: Check build - sync run: sudo /home/ubuntu/dist/skale-test-Linux-x86_64-sync diff --git a/Dockerfile b/Dockerfile index 15e36323..18f8b2f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ FROM python:3.11-bookworm ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y software-properties-common -RUN apt-get install -y \ +RUN apt-get update && \ git \ build-essential \ + software-properties-common \ zlib1g-dev \ libssl-dev \ libffi-dev \