From 7d0f7cf22e2054b4c6e5935607d6f34f7574d5d8 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Thu, 9 Nov 2023 19:21:13 +0100 Subject: [PATCH 1/2] ci: update mold, fix timeout --- .github/workflows/build-and-test.yml | 18 +++++++++--------- .github/workflows/triggerable.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 8531328645..40ffced68a 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -43,7 +43,7 @@ jobs: matrix: os: [ubuntu-20.04] wasm_cache_version: ["v2"] - mold_version: [2.1.0] + mold_version: [2.3.2] steps: - name: Checkout repo @@ -102,7 +102,7 @@ jobs: os: [ubuntu-20.04] wasm_cache_version: ["v2"] nightly_version: [nightly-2023-06-01] - mold_version: [2.1.0] + mold_version: [2.3.2] steps: - name: Checkout repo @@ -165,7 +165,7 @@ jobs: os: [ubuntu-20.04] wasm_cache_version: ["v2"] nightly_version: [nightly-2023-06-01] - mold_version: [2.1.0] + mold_version: [2.3.2] steps: - name: Download wasm artifacts @@ -188,14 +188,14 @@ jobs: unit-and-integration-tests: runs-on: group: gians-runners - timeout-minutes: 50 + timeout-minutes: 30 needs: [build-wasm] strategy: fail-fast: false matrix: os: [ubuntu-20.04] nightly_version: [nightly-2023-06-01] - mold_version: [2.1.0] + mold_version: [2.3.2] make: - name: ABCI @@ -284,14 +284,14 @@ jobs: run-benchmarks: runs-on: group: gians-runners - timeout-minutes: 30 + timeout-minutes: 60 needs: [build-wasm] strategy: fail-fast: false matrix: os: [ubuntu-20.04] nightly_version: [nightly-2023-06-01] - mold_version: [2.1.0] + mold_version: [2.3.2] make: - name: ABCI @@ -375,7 +375,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-20.04] - mold_version: [2.1.0] + mold_version: [2.3.2] make: - name: ABCI Release build @@ -475,7 +475,7 @@ jobs: matrix: os: [ubuntu-20.04] nightly_version: [nightly-2023-06-01] - mold_version: [2.1.0] + mold_version: [2.3.2] comet_bft: [0.37.2] hermes: [1.6.0-namada-beta1] make: diff --git a/.github/workflows/triggerable.yml b/.github/workflows/triggerable.yml index 811bc55fed..150f6b0648 100644 --- a/.github/workflows/triggerable.yml +++ b/.github/workflows/triggerable.yml @@ -33,7 +33,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-20.04] - mold_version: [2.1.0] + mold_version: [2.3.2] name: ["Run PoS state-machine tests"] command: ["make test-pos-sm"] timeout: [360] From 36863329127512f8c53224e305da36dd541c838e Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Fri, 10 Nov 2023 09:39:15 +0100 Subject: [PATCH 2/2] ci: update mold, remove unused ci files, added libudev --- .github/workflows/automation.yml | 13 +------------ .github/workflows/build-and-test.yml | 22 +++++++++++++++------- .github/workflows/checks.yml | 4 +++- .github/workflows/cron.yml | 4 +++- .github/workflows/docker.yml | 2 +- .github/workflows/docs.yml | 6 ++++-- .github/workflows/release.yml | 2 ++ .github/workflows/triggerable.yml | 4 +++- docker/namada-wasm/Dockerfile | 1 + docker/namada/Dockerfile | 3 ++- 10 files changed, 35 insertions(+), 26 deletions(-) diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml index f43f22f065..29a5829e6e 100644 --- a/.github/workflows/automation.yml +++ b/.github/workflows/automation.yml @@ -11,7 +11,6 @@ permissions: env: GIT_LFS_SKIP_SMUDGE: 1 - CHAIN_BUCKET: anoma-iac-files-master jobs: with_py: # tasks that are using python scripts from anoma-ci-iac @@ -21,23 +20,13 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] make: - name: Update wasm comment: pls update wasm command: update-wasm.py logs: 'false' timeout: 15 - - name: Publish wasm - comment: pls publish wasm - command: publish-wasm.py - logs: 'false' - timeout: 15 - - name: Spawn devnet - comment: pls spawn devnet - command: spawn-devnet.py - logs: 'false' - timeout: 25 steps: - name: Configure AWS Credentials diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 40ffced68a..5f22328b9e 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -41,7 +41,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] wasm_cache_version: ["v2"] mold_version: [2.3.2] @@ -99,7 +99,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] wasm_cache_version: ["v2"] nightly_version: [nightly-2023-06-01] mold_version: [2.3.2] @@ -162,7 +162,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] wasm_cache_version: ["v2"] nightly_version: [nightly-2023-06-01] mold_version: [2.3.2] @@ -193,7 +193,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] nightly_version: [nightly-2023-06-01] mold_version: [2.3.2] make: @@ -212,6 +212,8 @@ jobs: # See comment in build-and-test.yml with: ref: ${{ github.event.pull_request.head.sha }} + - name: Install libudev + run: sudo apt-get update && sudo apt-get -y install libudev-dev - name: Install Protoc uses: heliaxdev/setup-protoc@v2 with: @@ -289,7 +291,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] nightly_version: [nightly-2023-06-01] mold_version: [2.3.2] make: @@ -308,6 +310,8 @@ jobs: # See comment in build-and-test.yml with: ref: ${{ github.event.pull_request.head.sha }} + - name: Install libudev + run: sudo apt-get update && sudo apt-get -y install libudev-dev - name: Install Protoc uses: heliaxdev/setup-protoc@v2 with: @@ -374,7 +378,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] mold_version: [2.3.2] make: - name: ABCI Release build @@ -392,6 +396,8 @@ jobs: # See comment in build-and-test.yml with: ref: ${{ github.event.pull_request.head.sha }} + - name: Install libudev + run: sudo apt-get update && sudo apt-get -y install libudev-dev - name: Install Protoc uses: heliaxdev/setup-protoc@v2 with: @@ -473,7 +479,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] nightly_version: [nightly-2023-06-01] mold_version: [2.3.2] comet_bft: [0.37.2] @@ -497,6 +503,8 @@ jobs: # See comment in build-and-test.yml with: ref: ${{ github.event.pull_request.head.sha }} + - name: Install libudev + run: sudo apt-get update && sudo apt-get -y install libudev-dev - name: Install Protoc uses: heliaxdev/setup-protoc@v2 with: diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 6da22da803..7c5f589e08 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -35,7 +35,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] nightly_version: [nightly-2023-06-01] make: - name: Clippy @@ -59,6 +59,8 @@ jobs: sudo rm -rf /opt/ghc sudo rm -rf "/usr/local/share/boost" sudo rm -rf "$AGENT_TOOLSDIRECTORY" + - name: Install libudev + run: sudo apt-get update && sudo apt-get -y install libudev-dev - name: Install Protoc uses: heliaxdev/setup-protoc@v2 with: diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 7c35586998..96fa86a8ed 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] nightly_version: [nightly-2023-06-01] make: - name: Audit @@ -54,6 +54,8 @@ jobs: restore-keys: ${{ runner.os }}-cargo- - name: Install cargo ${{ matrix.make.command }} run: curl https://i.jpillora.com/${{ matrix.make.version }}! | bash + - name: Install libudev + run: sudo apt-get update && sudo apt-get -y install libudev-dev - name: Install Protoc uses: heliaxdev/setup-protoc@v2 with: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5a7e021297..e7c527c6c2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -27,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] make: - name: Build & Push WASM docker image image: wasm diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c37023e17e..a5fe474594 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -35,7 +35,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] nightly_version: [nightly-2023-06-01] mdbook_version: [rust-lang/mdbook@v0.4.18] mdbook_mermaid: [badboy/mdbook-mermaid@v0.11.1] @@ -60,6 +60,8 @@ jobs: # See comment in build-and-test.yml with: ref: ${{ github.event.pull_request.head.sha }} + - name: Install libudev + run: sudo apt-get update && sudo apt-get -y install libudev-dev - name: Install Protoc uses: heliaxdev/setup-protoc@v2 with: @@ -116,7 +118,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] steps: - name: Checkout repo diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59989b16d2..df5ed22dab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,6 +47,8 @@ jobs: - name: Switch to tag if specified if: "${{ github.event.inputs.tag != '' }}" run: git checkout ${{ github.event.inputs.tag }} + - name: Install libudev + run: sudo apt-get update && sudo apt-get -y install libudev-dev - name: Install Protoc uses: heliaxdev/setup-protoc@v2 with: diff --git a/.github/workflows/triggerable.yml b/.github/workflows/triggerable.yml index 150f6b0648..bcc9cbddb5 100644 --- a/.github/workflows/triggerable.yml +++ b/.github/workflows/triggerable.yml @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] mold_version: [2.3.2] name: ["Run PoS state-machine tests"] command: ["make test-pos-sm"] @@ -42,6 +42,8 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ inputs.branch }} + - name: Install libudev + run: sudo apt-get update && sudo apt-get -y install libudev-dev - name: Install Protoc uses: heliaxdev/setup-protoc@v2 with: diff --git a/docker/namada-wasm/Dockerfile b/docker/namada-wasm/Dockerfile index f625830774..b6422340bd 100644 --- a/docker/namada-wasm/Dockerfile +++ b/docker/namada-wasm/Dockerfile @@ -11,6 +11,7 @@ RUN rustup target add wasm32-unknown-unknown RUN apt-get update && apt-get install -y \ protobuf-compiler \ + libudev-dev \ && apt-get clean # Download binaryen and extract wasm-opt diff --git a/docker/namada/Dockerfile b/docker/namada/Dockerfile index 18f4dbfe3a..617b65be61 100644 --- a/docker/namada/Dockerfile +++ b/docker/namada/Dockerfile @@ -15,6 +15,7 @@ RUN apt-get update && apt-get install -y \ libssl-dev \ pkg-config \ protobuf-compiler \ + libudev-dev \ && apt-get clean COPY --from=planner /app/recipe.json recipe.json @@ -32,7 +33,7 @@ FROM debian:bullseye-slim AS runtime ENV NAMADA_BASE_DIR=/.namada ENV NAMADA_LOG_COLOR=false -RUN apt-get update && apt-get install libcurl4-openssl-dev -y && apt-get clean +RUN apt-get update && apt-get install libcurl4-openssl-dev libudev-dev -y && apt-get clean RUN useradd --create-home namada USER namada