Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 0 additions & 55 deletions .github/workflows/main_docker_publish.yaml

This file was deleted.

16 changes: 13 additions & 3 deletions .github/workflows/tag_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ name: Ethrex Release

on:
push:
# On tags, this generates a release and pushes docker images with the tag name
tags:
- "v*.*.*-*"
# On pushes to main, this silently builds and pushes docker images tagged as 'main'
branches:
- main

permissions:
contents: write
Expand Down Expand Up @@ -33,7 +37,6 @@ jobs:
- platform: ubuntu-22.04
os: linux
arch: x86_64
cpu_flags: RUSTFLAGS='-C target-cpu=x86-64-v2'
- platform: ubuntu-22.04-arm
os: linux
arch: aarch64
Expand Down Expand Up @@ -124,7 +127,7 @@ jobs:

- name: Build ethrex
run: |
COMPILE_CONTRACTS=true ${{ matrix.cpu_flags }} ${{ matrix.gpu_flags }} cargo build --release --features "${{ matrix.features }}" --bin ethrex
COMPILE_CONTRACTS=true ${{ matrix.gpu_flags }} cargo build --release --features "${{ matrix.features }}" --bin ethrex
chmod +x target/release/ethrex
mv target/release/ethrex ethrex${{ matrix.l2_suffix }}-${{ matrix.os }}-${{ matrix.arch }}${{ matrix.gpu_suffix }}

Expand Down Expand Up @@ -297,7 +300,13 @@ jobs:

- name: Format name
run: |
echo "TAG_VERSION=$(echo ${{ github.ref_name }} | tr -d v)" >> $GITHUB_ENV
# For branch builds (main) we want docker images tagged as 'main'. For tag pushes
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's already a CI that builds the docker image for main commits. We should remove either that or this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this change replace entirely the tag_latest workflow?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

# use the tag name (stripped of a leading 'v').
if [[ "$GITHUB_REF" == "refs/heads/main" ]]; then
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion from copilot:

Suggested change
if [[ "$GITHUB_REF" == "refs/heads/main" ]]; then
if [[ ${{ github.ref_type }} == "branch" ]]; then

echo "TAG_VERSION=main" >> $GITHUB_ENV
else
echo "TAG_VERSION=$(echo ${{ github.ref_name }} | tr -d v)" >> $GITHUB_ENV
fi

# Pushes to ghcr.io/lambdaclass/ethrex
- name: Build and push L1 Docker image
Expand All @@ -324,6 +333,7 @@ jobs:

# Creates a release on GitHub with the binaries
finalize-release:
if: github.ref_type == 'tag'
needs:
- build-ethrex
- build-ethrex-guest
Expand Down
5 changes: 1 addition & 4 deletions crates/common/crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ path = "./lib.rs"

[dependencies]
# TODO(#1102): Move to Lambdaworks in the future
c-kzg = { version = "2.1.1", default-features = false, optional = true, features = [
"ethereum_kzg_settings",
"std",
] }
c-kzg = { version = "2.1.1", optional = true }
kzg-rs.workspace = true

thiserror.workspace = true
Expand Down