From 262eaadc96e9f6ee8aa80d165410b6ac73919ef8 Mon Sep 17 00:00:00 2001 From: cosmicpsyop Date: Thu, 7 Dec 2023 22:55:08 -0800 Subject: [PATCH 1/5] ubuntu work: docker to lunar; github action latest (jammy) --- .github/workflows/ubuntu.yml | 32 ++++++++++++++++++++++++++++++++ ubuntu.Dockerfile | 6 +++--- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/ubuntu.yml diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml new file mode 100644 index 00000000..80fb00d2 --- /dev/null +++ b/.github/workflows/ubuntu.yml @@ -0,0 +1,32 @@ +name: ubuntu + +on: [push, pull_request] + +jobs: + ubuntu: + runs-on: ubuntu-latest + name: A job to build and run strfry on Ubuntu + steps: + - name: Checkout strfry + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Build strfry + run: | + sudo apt update && sudo apt install -y git g++ make pkg-config libtool ca-certificates \ + libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev \ + liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev + git submodule update --init + make setup-golpe + make -j4 + if ! [ -f ./strfry ]; then + echo "Strfry build failed." + exit 1 + fi + + - name: Run strfry + run: | + sudo ./strfry info + cat /etc/os-release + diff --git a/ubuntu.Dockerfile b/ubuntu.Dockerfile index 15ccff07..f202d2ee 100644 --- a/ubuntu.Dockerfile +++ b/ubuntu.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy as build +FROM ubuntu:lunar as build ENV TZ=Europe/London WORKDIR /build RUN apt update && apt install -y --no-install-recommends \ @@ -12,11 +12,11 @@ RUN git submodule update --init RUN make setup-golpe RUN make -j4 -FROM ubuntu:jammy as runner +FROM ubuntu:lunar as runner WORKDIR /app RUN apt update && apt install -y --no-install-recommends \ - liblmdb0 libflatbuffers1 libsecp256k1-0 libb2-1 libzstd1 \ + liblmdb0 libflatbuffers2 libsecp256k1-1 libb2-1 libzstd1 libssl3 \ && rm -rf /var/lib/apt/lists/* COPY --from=build /build/strfry strfry From 46cb7490372a8e237ed859bf238845d7a652177f Mon Sep 17 00:00:00 2001 From: cosmicpsyop Date: Fri, 8 Dec 2023 00:39:42 -0800 Subject: [PATCH 2/5] move lunar to another branch --- ubuntu.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ubuntu.Dockerfile b/ubuntu.Dockerfile index f202d2ee..15ccff07 100644 --- a/ubuntu.Dockerfile +++ b/ubuntu.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:lunar as build +FROM ubuntu:jammy as build ENV TZ=Europe/London WORKDIR /build RUN apt update && apt install -y --no-install-recommends \ @@ -12,11 +12,11 @@ RUN git submodule update --init RUN make setup-golpe RUN make -j4 -FROM ubuntu:lunar as runner +FROM ubuntu:jammy as runner WORKDIR /app RUN apt update && apt install -y --no-install-recommends \ - liblmdb0 libflatbuffers2 libsecp256k1-1 libb2-1 libzstd1 libssl3 \ + liblmdb0 libflatbuffers1 libsecp256k1-0 libb2-1 libzstd1 \ && rm -rf /var/lib/apt/lists/* COPY --from=build /build/strfry strfry From 5eaec1fce2f28eb58eefa07be8bf4d2bc233c34b Mon Sep 17 00:00:00 2001 From: cosmicpsyop Date: Fri, 8 Dec 2023 15:19:44 -0800 Subject: [PATCH 3/5] ubuntu add --no-install-recommends and bg relay --- .github/workflows/ubuntu.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 80fb00d2..51b45ef5 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -14,7 +14,8 @@ jobs: - name: Build strfry run: | - sudo apt update && sudo apt install -y git g++ make pkg-config libtool ca-certificates \ + sudo apt update && sudo apt install -y --no-install-recommends \ + git g++ make pkg-config libtool ca-certificates \ libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev \ liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev git submodule update --init @@ -27,6 +28,6 @@ jobs: - name: Run strfry run: | - sudo ./strfry info cat /etc/os-release + sudo ./strfry relay & From e238fc2120a17fabd48398af77e9314cd85b0a9b Mon Sep 17 00:00:00 2001 From: cosmicpsyop Date: Fri, 8 Dec 2023 23:38:59 -0800 Subject: [PATCH 4/5] ubuntu docker add --- .github/workflows/ubuntu-docker.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/ubuntu-docker.yml diff --git a/.github/workflows/ubuntu-docker.yml b/.github/workflows/ubuntu-docker.yml new file mode 100644 index 00000000..ee896dc7 --- /dev/null +++ b/.github/workflows/ubuntu-docker.yml @@ -0,0 +1,24 @@ +name: ubuntu-docker + +on: [push, pull_request] + +jobs: + ubuntu-docker: + runs-on: ubuntu-latest + name: A job to build and run strfry Ubuntu using Docker + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Build the Ubuntu jammy Docker image for strfry + run: | + docker build . --file ubuntu.Dockerfile --tag jammy/strfry + + - name: Run the Ubuntu jammy Docker image for strfry + run: | + docker images + pwd + docker run -v /home/runner/work/strfry/strfry/strfry-db:/app/strfry-db -v /home/runner/work/strfry/strfry/strfry.conf:/app/strfry.conf -t jammy/strfry & + From 001349c296485760459605986ee972427f5ae96f Mon Sep 17 00:00:00 2001 From: cosmicpsyop Date: Wed, 20 Dec 2023 20:50:02 -0800 Subject: [PATCH 5/5] simple ubuntu-docker job to test; move ubuntu.yml host build job --- .github/workflows/ubuntu.yml | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 .github/workflows/ubuntu.yml diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml deleted file mode 100644 index 51b45ef5..00000000 --- a/.github/workflows/ubuntu.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: ubuntu - -on: [push, pull_request] - -jobs: - ubuntu: - runs-on: ubuntu-latest - name: A job to build and run strfry on Ubuntu - steps: - - name: Checkout strfry - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Build strfry - run: | - sudo apt update && sudo apt install -y --no-install-recommends \ - git g++ make pkg-config libtool ca-certificates \ - libyaml-perl libtemplate-perl libregexp-grammars-perl libssl-dev zlib1g-dev \ - liblmdb-dev libflatbuffers-dev libsecp256k1-dev libzstd-dev - git submodule update --init - make setup-golpe - make -j4 - if ! [ -f ./strfry ]; then - echo "Strfry build failed." - exit 1 - fi - - - name: Run strfry - run: | - cat /etc/os-release - sudo ./strfry relay & -