Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a5bc992590
|
|||
|
5a86f7cc16
|
|||
|
ba5020138f
|
|||
|
209150771e
|
|||
|
|
7c60af3464 | ||
|
ada76b0153
|
|||
|
15ded3a5bd
|
61
.gitea/scripts/copr-build.sh
Executable file
61
.gitea/scripts/copr-build.sh
Executable file
@@ -0,0 +1,61 @@
|
||||
#!/bin/bash
|
||||
# Submit an SRPM to COPR, watch the build, and dump per-chroot build logs
|
||||
# to stdout so they are captured in CI output.
|
||||
#
|
||||
# Usage: copr-build.sh <project> <srpm> [srpm...]
|
||||
# Example: copr-build.sh helexa/cortex ./cortex-0.1.2-1.fc43.src.rpm
|
||||
|
||||
set -o pipefail
|
||||
|
||||
PROJECT="$1"
|
||||
shift
|
||||
|
||||
if [ -z "$PROJECT" ] || [ "$#" -eq 0 ]; then
|
||||
echo "usage: $0 <project> <srpm> [srpm...]" >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
# Submit without waiting; capture the build ID from stdout.
|
||||
SUBMIT_OUT=$(copr-cli build --nowait "$PROJECT" "$@")
|
||||
echo "$SUBMIT_OUT"
|
||||
BUILD_ID=$(echo "$SUBMIT_OUT" | grep -oP 'Created builds: \K[0-9]+' | head -n1)
|
||||
|
||||
if [ -z "$BUILD_ID" ]; then
|
||||
echo "error: could not parse build ID from copr-cli output" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "Build $BUILD_ID submitted to $PROJECT"
|
||||
echo "Follow live: https://copr.fedorainfracloud.org/coprs/build/$BUILD_ID"
|
||||
echo
|
||||
|
||||
# Watch the build; captures status transitions to stdout. Exit non-zero
|
||||
# on build failure, but defer propagating that until after we've fetched
|
||||
# logs so the CI output contains diagnostics either way.
|
||||
if copr-cli watch-build "$BUILD_ID"; then
|
||||
STATUS=0
|
||||
else
|
||||
STATUS=$?
|
||||
fi
|
||||
|
||||
# Fetch per-chroot results (logs + rpms). Anonymous download — no auth needed.
|
||||
mkdir -p copr-logs
|
||||
copr-cli download-build --dest copr-logs "$BUILD_ID" || {
|
||||
echo "warning: failed to download build artifacts" >&2
|
||||
}
|
||||
|
||||
# Dump each chroot's builder-live.log as a collapsible group.
|
||||
for chroot_dir in copr-logs/*/; do
|
||||
[ -d "$chroot_dir" ] || continue
|
||||
chroot=$(basename "$chroot_dir")
|
||||
log="${chroot_dir}builder-live.log"
|
||||
if [ -f "$log" ]; then
|
||||
echo
|
||||
echo "::group::${chroot} builder-live.log"
|
||||
cat "$log"
|
||||
echo "::endgroup::"
|
||||
fi
|
||||
done
|
||||
|
||||
exit "$STATUS"
|
||||
@@ -8,6 +8,7 @@ on:
|
||||
branches: [main]
|
||||
|
||||
env:
|
||||
CARGO_INCREMENTAL: "0"
|
||||
RUSTC_WRAPPER: sccache
|
||||
SCCACHE_BUCKET: sccache
|
||||
SCCACHE_ENDPOINT: http://caveman.kosherinata.internal:9000
|
||||
@@ -23,6 +24,19 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Cache cargo registry and target
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/bin
|
||||
~/.cargo/registry/index
|
||||
~/.cargo/registry/cache
|
||||
~/.cargo/git/db
|
||||
target
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Ensure sccache with S3 support
|
||||
env:
|
||||
RUSTC_WRAPPER: ""
|
||||
@@ -39,9 +53,6 @@ jobs:
|
||||
- name: Clippy
|
||||
run: cargo clippy --workspace -- -D warnings
|
||||
|
||||
- name: Build
|
||||
run: cargo build --workspace
|
||||
|
||||
- name: Test
|
||||
run: cargo test --workspace
|
||||
|
||||
@@ -157,6 +168,8 @@ jobs:
|
||||
runs-on: fedora
|
||||
needs: srpm-cortex
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Download SRPM
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
@@ -168,13 +181,15 @@ jobs:
|
||||
echo "${{ secrets.COPR_CONFIG }}" > ~/.config/copr
|
||||
|
||||
- name: Submit build to COPR
|
||||
run: copr-cli build helexa/cortex *.src.rpm
|
||||
run: bash .gitea/scripts/copr-build.sh helexa/cortex *.src.rpm
|
||||
|
||||
copr-neuron:
|
||||
name: Publish neuron to COPR
|
||||
runs-on: fedora
|
||||
needs: srpm-neuron
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Download SRPM
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
@@ -186,7 +201,7 @@ jobs:
|
||||
echo "${{ secrets.COPR_CONFIG }}" > ~/.config/copr
|
||||
|
||||
- name: Submit build to COPR
|
||||
run: copr-cli build helexa/neuron *.src.rpm
|
||||
run: bash .gitea/scripts/copr-build.sh helexa/neuron *.src.rpm
|
||||
|
||||
bump-version:
|
||||
name: Bump version in source
|
||||
|
||||
8
Cargo.lock
generated
8
Cargo.lock
generated
@@ -351,7 +351,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
|
||||
|
||||
[[package]]
|
||||
name = "cortex-cli"
|
||||
version = "0.1.0"
|
||||
version = "0.1.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
@@ -366,7 +366,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cortex-core"
|
||||
version = "0.1.0"
|
||||
version = "0.1.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@@ -381,7 +381,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cortex-gateway"
|
||||
version = "0.1.0"
|
||||
version = "0.1.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"axum",
|
||||
@@ -1184,7 +1184,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "neuron"
|
||||
version = "0.1.0"
|
||||
version = "0.1.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
|
||||
@@ -8,7 +8,7 @@ members = [
|
||||
]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.1.0"
|
||||
version = "0.1.2"
|
||||
edition = "2024"
|
||||
license = "GPL-3.0-or-later"
|
||||
repository = "https://git.lair.cafe/helexa/cortex"
|
||||
|
||||
18
cortex.spec
18
cortex.spec
@@ -1,5 +1,5 @@
|
||||
Name: cortex
|
||||
Version: 0.1.0
|
||||
Version: 0.1.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Inference gateway for multi-node GPU clusters
|
||||
|
||||
@@ -13,9 +13,20 @@ ExclusiveArch: x86_64
|
||||
BuildRequires: rust >= 1.85
|
||||
BuildRequires: cargo
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
BuildRequires: systemd-rpm-macros
|
||||
|
||||
Requires(pre): shadow-utils
|
||||
Requires: systemd
|
||||
|
||||
# rpm's sysusers provides-generator only emits versioned user(cortex) when
|
||||
# the u-line has GECOS/home/shell fields. %attr(,,cortex) in %files emits
|
||||
# an unversioned Requires: user(cortex), so we provide it explicitly.
|
||||
Provides: user(cortex)
|
||||
Provides: group(cortex)
|
||||
|
||||
%description
|
||||
Cortex is a Rust reverse-proxy that sits in front of multiple inference
|
||||
@@ -41,13 +52,13 @@ cargo build --release -p cortex-cli
|
||||
%install
|
||||
install -Dm755 target/release/cortex %{buildroot}%{_bindir}/cortex
|
||||
install -Dm644 data/cortex.service %{buildroot}%{_unitdir}/cortex.service
|
||||
install -Dm644 data/cortex-sysusers.conf %{buildroot}%{_sysusersdir}/cortex.conf
|
||||
install -dm750 %{buildroot}%{_sysconfdir}/cortex
|
||||
install -Dm640 cortex.example.toml %{buildroot}%{_sysconfdir}/cortex/cortex.toml
|
||||
install -Dm640 models.example.toml %{buildroot}%{_sysconfdir}/cortex/models.toml
|
||||
|
||||
%pre
|
||||
getent group cortex >/dev/null || groupadd -r cortex
|
||||
getent passwd cortex >/dev/null || useradd -r -g cortex -d /var/lib/cortex -s /sbin/nologin cortex
|
||||
%sysusers_create_compat %{_builddir}/%{name}-%{version}/data/cortex-sysusers.conf
|
||||
|
||||
%post
|
||||
%systemd_post cortex.service
|
||||
@@ -63,6 +74,7 @@ getent passwd cortex >/dev/null || useradd -r -g cortex -d /var/lib/cortex -s /s
|
||||
%doc README.md
|
||||
%{_bindir}/cortex
|
||||
%{_unitdir}/cortex.service
|
||||
%{_sysusersdir}/cortex.conf
|
||||
%dir %attr(750,root,cortex) %{_sysconfdir}/cortex
|
||||
%config(noreplace) %attr(640,root,cortex) %{_sysconfdir}/cortex/cortex.toml
|
||||
%config(noreplace) %attr(640,root,cortex) %{_sysconfdir}/cortex/models.toml
|
||||
|
||||
3
data/cortex-sysusers.conf
Normal file
3
data/cortex-sysusers.conf
Normal file
@@ -0,0 +1,3 @@
|
||||
g cortex - -
|
||||
u cortex - "Cortex inference cluster" /var/lib/cortex /sbin/nologin
|
||||
m cortex cortex
|
||||
18
neuron.spec
18
neuron.spec
@@ -1,5 +1,5 @@
|
||||
Name: neuron
|
||||
Version: 0.1.0
|
||||
Version: 0.1.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Per-node GPU discovery and harness management daemon for cortex
|
||||
|
||||
@@ -13,9 +13,20 @@ ExclusiveArch: x86_64
|
||||
BuildRequires: rust >= 1.85
|
||||
BuildRequires: cargo
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
BuildRequires: systemd-rpm-macros
|
||||
|
||||
Requires(pre): shadow-utils
|
||||
Requires: systemd
|
||||
|
||||
# rpm's sysusers provides-generator only emits versioned user(cortex) when
|
||||
# the u-line has GECOS/home/shell fields. %attr(,,cortex) in %files emits
|
||||
# an unversioned Requires: user(cortex), so we provide it explicitly.
|
||||
Provides: user(cortex)
|
||||
Provides: group(cortex)
|
||||
|
||||
%description
|
||||
Neuron is a per-node daemon for cortex inference clusters. It discovers
|
||||
@@ -40,12 +51,12 @@ cargo build --release -p neuron
|
||||
%install
|
||||
install -Dm755 target/release/neuron %{buildroot}%{_bindir}/neuron
|
||||
install -Dm644 data/neuron.service %{buildroot}%{_unitdir}/neuron.service
|
||||
install -Dm644 data/cortex-sysusers.conf %{buildroot}%{_sysusersdir}/neuron.conf
|
||||
install -dm750 %{buildroot}%{_sysconfdir}/cortex
|
||||
install -Dm640 neuron.example.toml %{buildroot}%{_sysconfdir}/cortex/neuron.toml
|
||||
|
||||
%pre
|
||||
getent group cortex >/dev/null || groupadd -r cortex
|
||||
getent passwd cortex >/dev/null || useradd -r -g cortex -d /var/lib/cortex -s /sbin/nologin cortex
|
||||
%sysusers_create_compat %{_builddir}/%{name}-%{version}/data/cortex-sysusers.conf
|
||||
|
||||
%post
|
||||
%systemd_post neuron.service
|
||||
@@ -61,6 +72,7 @@ getent passwd cortex >/dev/null || useradd -r -g cortex -d /var/lib/cortex -s /s
|
||||
%doc README.md
|
||||
%{_bindir}/neuron
|
||||
%{_unitdir}/neuron.service
|
||||
%{_sysusersdir}/neuron.conf
|
||||
%dir %attr(750,root,cortex) %{_sysconfdir}/cortex
|
||||
%config(noreplace) %attr(640,root,cortex) %{_sysconfdir}/cortex/neuron.toml
|
||||
|
||||
|
||||
Reference in New Issue
Block a user