Skip to content

Commit

Permalink
Merge branch 'fraccaman/ci-here-we-go-again-33'
Browse files Browse the repository at this point in the history
* fraccaman/ci-here-we-go-again-33:
  ci: update mold, remove unused ci files, added libudev
  ci: update mold, fix timeout
  • Loading branch information
Fraccaman committed Nov 10, 2023
2 parents 3a0ecd8 + 3686332 commit 193ca95
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 36 deletions.
13 changes: 1 addition & 12 deletions .github/workflows/automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
40 changes: 24 additions & 16 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
os: [ubuntu-latest]
wasm_cache_version: ["v2"]
mold_version: [2.1.0]
mold_version: [2.3.2]

steps:
- name: Checkout repo
Expand Down Expand Up @@ -99,10 +99,10 @@ 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.1.0]
mold_version: [2.3.2]

steps:
- name: Checkout repo
Expand Down Expand Up @@ -162,10 +162,10 @@ 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.1.0]
mold_version: [2.3.2]

steps:
- name: Download wasm artifacts
Expand All @@ -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]
os: [ubuntu-latest]
nightly_version: [nightly-2023-06-01]
mold_version: [2.1.0]
mold_version: [2.3.2]
make:
- name: ABCI

Expand All @@ -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:
Expand Down Expand Up @@ -284,14 +286,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]
os: [ubuntu-latest]
nightly_version: [nightly-2023-06-01]
mold_version: [2.1.0]
mold_version: [2.3.2]
make:
- name: ABCI

Expand All @@ -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:
Expand Down Expand Up @@ -374,8 +378,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
mold_version: [2.1.0]
os: [ubuntu-latest]
mold_version: [2.3.2]
make:
- name: ABCI Release build

Expand All @@ -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:
Expand Down Expand Up @@ -473,9 +479,9 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
os: [ubuntu-latest]
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:
Expand All @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]]
mdbook_mermaid: [badboy/[email protected]]
Expand All @@ -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:
Expand Down Expand Up @@ -116,7 +118,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
os: [ubuntu-latest]

steps:
- name: Checkout repo
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/triggerable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
mold_version: [2.1.0]
os: [ubuntu-latest]
mold_version: [2.3.2]
name: ["Run PoS state-machine tests"]
command: ["make test-pos-sm"]
timeout: [360]
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions docker/namada-wasm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion docker/namada/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 193ca95

Please sign in to comment.