mirror of
https://github.com/logos-blockchain/logos-blockchain-testing.git
synced 2026-01-07 15:53:10 +00:00
Require versions.env, add rev updater, and externalize Docker args
This commit is contained in:
parent
0835669898
commit
78f38f4ca0
4
.github/workflows/build-binaries.yml
vendored
4
.github/workflows/build-binaries.yml
vendored
@ -5,8 +5,6 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
CARGO_TERM_COLOR: always
|
CARGO_TERM_COLOR: always
|
||||||
NOMOS_NODE_REV: d2dd5a5084e1daef4032562c77d41de5e4d495f8
|
|
||||||
NOMOS_BUNDLE_VERSION: v4
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build_nomos_binaries:
|
build_nomos_binaries:
|
||||||
@ -37,7 +35,7 @@ jobs:
|
|||||||
sudo apt-get install -y clang llvm-dev libclang-dev pkg-config cmake libssl-dev rsync libgmp10 libgmp-dev libgomp1 nasm
|
sudo apt-get install -y clang llvm-dev libclang-dev pkg-config cmake libssl-dev rsync libgmp10 libgmp-dev libgomp1 nasm
|
||||||
- name: Install nomos circuits
|
- name: Install nomos circuits
|
||||||
run: |
|
run: |
|
||||||
./scripts/setup-nomos-circuits.sh v0.3.1 "$NOMOS_CIRCUITS"
|
./scripts/setup-nomos-circuits.sh "${VERSION}" "$NOMOS_CIRCUITS"
|
||||||
echo "NOMOS_CIRCUITS=$NOMOS_CIRCUITS" >> "$GITHUB_ENV"
|
echo "NOMOS_CIRCUITS=$NOMOS_CIRCUITS" >> "$GITHUB_ENV"
|
||||||
- name: Add top-level KZG params file
|
- name: Add top-level KZG params file
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
8
.github/workflows/lint.yml
vendored
8
.github/workflows/lint.yml
vendored
@ -7,8 +7,6 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
CARGO_TERM_COLOR: always
|
CARGO_TERM_COLOR: always
|
||||||
NOMOS_NODE_REV: d2dd5a5084e1daef4032562c77d41de5e4d495f8
|
|
||||||
NOMOS_BUNDLE_VERSION: v4
|
|
||||||
permissions:
|
permissions:
|
||||||
actions: read
|
actions: read
|
||||||
contents: read
|
contents: read
|
||||||
@ -31,7 +29,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
- name: Install nomos circuits
|
- name: Install nomos circuits
|
||||||
run: |
|
run: |
|
||||||
./scripts/setup-nomos-circuits.sh v0.3.1 "$HOME/.nomos-circuits"
|
./scripts/setup-nomos-circuits.sh "${VERSION}" "$HOME/.nomos-circuits"
|
||||||
echo "NOMOS_CIRCUITS=$HOME/.nomos-circuits" >> "$GITHUB_ENV"
|
echo "NOMOS_CIRCUITS=$HOME/.nomos-circuits" >> "$GITHUB_ENV"
|
||||||
- uses: dtolnay/rust-toolchain@master
|
- uses: dtolnay/rust-toolchain@master
|
||||||
with:
|
with:
|
||||||
@ -62,7 +60,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
- name: Install nomos circuits
|
- name: Install nomos circuits
|
||||||
run: |
|
run: |
|
||||||
./scripts/setup-nomos-circuits.sh v0.3.1 "$HOME/.nomos-circuits"
|
./scripts/setup-nomos-circuits.sh "${VERSION}" "$HOME/.nomos-circuits"
|
||||||
echo "NOMOS_CIRCUITS=$HOME/.nomos-circuits" >> "$GITHUB_ENV"
|
echo "NOMOS_CIRCUITS=$HOME/.nomos-circuits" >> "$GITHUB_ENV"
|
||||||
- uses: dtolnay/rust-toolchain@master
|
- uses: dtolnay/rust-toolchain@master
|
||||||
with:
|
with:
|
||||||
@ -93,7 +91,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
- name: Install nomos circuits
|
- name: Install nomos circuits
|
||||||
run: |
|
run: |
|
||||||
./scripts/setup-nomos-circuits.sh v0.3.1 "$HOME/.nomos-circuits"
|
./scripts/setup-nomos-circuits.sh "${VERSION}" "$HOME/.nomos-circuits"
|
||||||
echo "NOMOS_CIRCUITS=$HOME/.nomos-circuits" >> "$GITHUB_ENV"
|
echo "NOMOS_CIRCUITS=$HOME/.nomos-circuits" >> "$GITHUB_ENV"
|
||||||
- uses: dtolnay/rust-toolchain@master
|
- uses: dtolnay/rust-toolchain@master
|
||||||
with:
|
with:
|
||||||
|
|||||||
@ -32,6 +32,9 @@ ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
|||||||
if [ -f "${ROOT_DIR}/versions.env" ]; then
|
if [ -f "${ROOT_DIR}/versions.env" ]; then
|
||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
. "${ROOT_DIR}/versions.env"
|
. "${ROOT_DIR}/versions.env"
|
||||||
|
else
|
||||||
|
echo "ERROR: versions.env missing; run from repo root or restore the file." >&2
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
DEFAULT_VERSION="${VERSION:-v0.3.1}"
|
DEFAULT_VERSION="${VERSION:-v0.3.1}"
|
||||||
DEFAULT_NODE_REV="${NOMOS_NODE_REV:-d2dd5a5084e1daef4032562c77d41de5e4d495f8}"
|
DEFAULT_NODE_REV="${NOMOS_NODE_REV:-d2dd5a5084e1daef4032562c77d41de5e4d495f8}"
|
||||||
|
|||||||
@ -59,10 +59,12 @@ if [ -n "${NOMOS_BINARIES_TAR:-}" ] && [ ! -f "${NOMOS_BINARIES_TAR}" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
readonly ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
readonly ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
if [ -f "${ROOT_DIR}/versions.env" ]; then
|
if [ ! -f "${ROOT_DIR}/versions.env" ]; then
|
||||||
# shellcheck disable=SC1091
|
echo "ERROR: versions.env missing; run from repo root or restore the file." >&2
|
||||||
. "${ROOT_DIR}/versions.env"
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
# shellcheck disable=SC1091
|
||||||
|
. "${ROOT_DIR}/versions.env"
|
||||||
if [ -f "${ROOT_DIR}/paths.env" ]; then
|
if [ -f "${ROOT_DIR}/paths.env" ]; then
|
||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
. "${ROOT_DIR}/paths.env"
|
. "${ROOT_DIR}/paths.env"
|
||||||
|
|||||||
30
scripts/update-nomos-rev.sh
Normal file
30
scripts/update-nomos-rev.sh
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# Update nomos-node revision across versions.env and Cargo.toml.
|
||||||
|
# Usage: scripts/update-nomos-rev.sh <new_rev>
|
||||||
|
|
||||||
|
if [ "$#" -ne 1 ]; then
|
||||||
|
echo "Usage: $0 <new_nomós_node_rev>" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
NEW_REV="$1"
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
|
|
||||||
|
if [ ! -f "${ROOT_DIR}/versions.env" ]; then
|
||||||
|
echo "ERROR: versions.env missing; run from repo root." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Updating nomos-node rev to ${NEW_REV}"
|
||||||
|
|
||||||
|
# Update versions.env NOMOS_NODE_REV entry (keep other lines intact).
|
||||||
|
sed -i.bak -E "s/^NOMOS_NODE_REV=.*/NOMOS_NODE_REV=${NEW_REV}/" "${ROOT_DIR}/versions.env"
|
||||||
|
rm -f "${ROOT_DIR}/versions.env.bak"
|
||||||
|
|
||||||
|
# Update all rev fields in Cargo.toml pointing to nomos-node.
|
||||||
|
sed -i.bak -E "s/(git = \"https:\/\/github.com\/logos-co\/nomos-node\.git\", rev = \")[^\"]+(\".*)/\1${NEW_REV}\2/" "${ROOT_DIR}/Cargo.toml"
|
||||||
|
rm -f "${ROOT_DIR}/Cargo.toml.bak"
|
||||||
|
|
||||||
|
echo "Done. Consider updating Cargo.lock if needed (cargo fetch)."
|
||||||
@ -2,10 +2,10 @@
|
|||||||
# check=skip=SecretsUsedInArgOrEnv
|
# check=skip=SecretsUsedInArgOrEnv
|
||||||
# Ignore warnings about sensitive information as this is test data.
|
# Ignore warnings about sensitive information as this is test data.
|
||||||
|
|
||||||
ARG VERSION=v0.3.1
|
ARG VERSION
|
||||||
ARG CIRCUITS_OVERRIDE
|
ARG CIRCUITS_OVERRIDE
|
||||||
ARG NOMOS_NODE_REV=d2dd5a5084e1daef4032562c77d41de5e4d495f8
|
ARG NOMOS_NODE_REV
|
||||||
ARG CIRCUITS_PLATFORM=linux-x86_64
|
ARG CIRCUITS_PLATFORM
|
||||||
|
|
||||||
# ===========================
|
# ===========================
|
||||||
# BUILD IMAGE
|
# BUILD IMAGE
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user