GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests Projects Releases 323 Packages Wiki Activity Actions

Fix: rename gbserver to botserver, use rustup for Rust install, remove macOS
Some checks failed
GBCI Bundle / build-bundle (push) Failing after 27m36s
Details
GBCI / build (push) Failing after 23m47s
Details

Browse source
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2025-12-16 19:17:47 -03:00
parent 62e22f1180
commit 8788ad7df2
2 changed files with 47 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
.forgejo/workflows/botserver-bundle.yaml
View file

@ -37,15 +37,12 @@ jobs:
${{ runner.os }}-cargo-bundle- ${{ runner.os }}-cargo-bundle-
- name: Install Rust - name: Install Rust
uses: msrd0/rust-toolchain@v1 run: |
with: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
toolchain: stable source ~/.cargo/env
targets: >- rustup target add x86_64-unknown-linux-gnu
x86_64-unknown-linux-gnu, rustup target add aarch64-unknown-linux-gnu
aarch64-unknown-linux-gnu, rustup target add x86_64-pc-windows-gnu
x86_64-pc-windows-gnu,
x86_64-apple-darwin,
aarch64-apple-darwin
- name: Install cross-compilation dependencies - name: Install cross-compilation dependencies
run: | run: |
@ -93,29 +90,30 @@ jobs:
# Build botserver for all platforms # Build botserver for all platforms
# ============================================ # ============================================
- name: Build botserver - Linux x86_64 - name: Build botserver - Linux x86_64
run: cargo build --release --locked --target x86_64-unknown-linux-gnu run: |
source ~/.cargo/env
cargo build --release --locked --target x86_64-unknown-linux-gnu
- name: Build botserver - Linux ARM64 - name: Build botserver - Linux ARM64
env: env:
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
run: cargo build --release --locked --target aarch64-unknown-linux-gnu run: |
source ~/.cargo/env
cargo build --release --locked --target aarch64-unknown-linux-gnu
- name: Build botserver - Windows x86_64 - name: Build botserver - Windows x86_64
env: env:
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc
run: cargo build --release --locked --target x86_64-pc-windows-gnu run: |
source ~/.cargo/env
- name: Build botserver - macOS x86_64 cargo build --release --locked --target x86_64-pc-windows-gnu
run: cargo build --release --locked --target x86_64-apple-darwin || echo "macOS x86_64 requires osxcross"
- name: Build botserver - macOS ARM64
run: cargo build --release --locked --target aarch64-apple-darwin || echo "macOS ARM64 requires osxcross"
# ============================================ # ============================================
# Build botui for all platforms # Build botui for all platforms
# ============================================ # ============================================
- name: Build botui - Linux x86_64 - name: Build botui - Linux x86_64
run: | run: |
source ~/.cargo/env
cd ../botui cd ../botui
cargo build --release --locked --target x86_64-unknown-linux-gnu cargo build --release --locked --target x86_64-unknown-linux-gnu
@ -123,6 +121,7 @@ jobs:
env: env:
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
run: | run: |
source ~/.cargo/env
cd ../botui cd ../botui
cargo build --release --locked --target aarch64-unknown-linux-gnu cargo build --release --locked --target aarch64-unknown-linux-gnu
@ -130,24 +129,16 @@ jobs:
env: env:
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc
run: | run: |
source ~/.cargo/env
cd ../botui cd ../botui
cargo build --release --locked --target x86_64-pc-windows-gnu cargo build --release --locked --target x86_64-pc-windows-gnu
- name: Build botui - macOS x86_64
run: |
cd ../botui
cargo build --release --locked --target x86_64-apple-darwin || echo "macOS x86_64 requires osxcross"
- name: Build botui - macOS ARM64
run: |
cd ../botui
cargo build --release --locked --target aarch64-apple-darwin || echo "macOS ARM64 requires osxcross"
# ============================================ # ============================================
# Build botbook documentation # Build botbook documentation
# ============================================ # ============================================
- name: Install mdBook - name: Install mdBook
run: | run: |
source ~/.cargo/env
if ! command -v mdbook &> /dev/null; then if ! command -v mdbook &> /dev/null; then
cargo install mdbook cargo install mdbook
fi fi
@ -177,58 +168,44 @@ jobs:
# Linux x86_64 bundle # Linux x86_64 bundle
mkdir -p bundle/linux-x86_64/botserver-components mkdir -p bundle/linux-x86_64/botserver-components
mkdir -p bundle/linux-x86_64/botserver-installers mkdir -p bundle/linux-x86_64/botserver-installers
cp ./target/x86_64-unknown-linux-gnu/release/gbserver bundle/linux-x86_64/botserver || true cp ./target/x86_64-unknown-linux-gnu/release/botserver bundle/linux-x86_64/botserver || true
cp ../botui/target/x86_64-unknown-linux-gnu/release/botui bundle/linux-x86_64/botserver-components/ || true cp ../botui/target/x86_64-unknown-linux-gnu/release/botui bundle/linux-x86_64/botserver-components/ || true
cp python-installers/python-${PYTHON_VERSION}-linux-x86_64.tar.gz bundle/linux-x86_64/botserver-installers/ cp python-installers/python-${PYTHON_VERSION}-linux-x86_64.tar.gz bundle/linux-x86_64/botserver-installers/
# Linux ARM64 bundle # Linux ARM64 bundle
mkdir -p bundle/linux-arm64/botserver-components mkdir -p bundle/linux-arm64/botserver-components
mkdir -p bundle/linux-arm64/botserver-installers mkdir -p bundle/linux-arm64/botserver-installers
cp ./target/aarch64-unknown-linux-gnu/release/gbserver bundle/linux-arm64/botserver || true cp ./target/aarch64-unknown-linux-gnu/release/botserver bundle/linux-arm64/botserver || true
cp ../botui/target/aarch64-unknown-linux-gnu/release/botui bundle/linux-arm64/botserver-components/ || true cp ../botui/target/aarch64-unknown-linux-gnu/release/botui bundle/linux-arm64/botserver-components/ || true
cp python-installers/python-${PYTHON_VERSION}-linux-arm64.tar.gz bundle/linux-arm64/botserver-installers/ cp python-installers/python-${PYTHON_VERSION}-linux-arm64.tar.gz bundle/linux-arm64/botserver-installers/
# Windows x86_64 bundle # Windows x86_64 bundle
mkdir -p bundle/windows-x86_64/botserver-components mkdir -p bundle/windows-x86_64/botserver-components
mkdir -p bundle/windows-x86_64/botserver-installers mkdir -p bundle/windows-x86_64/botserver-installers
cp ./target/x86_64-pc-windows-gnu/release/gbserver.exe bundle/windows-x86_64/botserver.exe || true cp ./target/x86_64-pc-windows-gnu/release/botserver.exe bundle/windows-x86_64/botserver.exe || true
cp ../botui/target/x86_64-pc-windows-gnu/release/botui.exe bundle/windows-x86_64/botserver-components/ || true cp ../botui/target/x86_64-pc-windows-gnu/release/botui.exe bundle/windows-x86_64/botserver-components/ || true
cp python-installers/python-${PYTHON_VERSION}-windows-x86_64.tar.gz bundle/windows-x86_64/botserver-installers/ cp python-installers/python-${PYTHON_VERSION}-windows-x86_64.tar.gz bundle/windows-x86_64/botserver-installers/
# macOS x86_64 bundle
mkdir -p bundle/macos-x86_64/botserver-components
mkdir -p bundle/macos-x86_64/botserver-installers
cp ./target/x86_64-apple-darwin/release/gbserver bundle/macos-x86_64/botserver || true
cp ../botui/target/x86_64-apple-darwin/release/botui bundle/macos-x86_64/botserver-components/ || true
cp python-installers/python-${PYTHON_VERSION}-macos-x86_64.tar.gz bundle/macos-x86_64/botserver-installers/
# macOS ARM64 bundle
mkdir -p bundle/macos-arm64/botserver-components
mkdir -p bundle/macos-arm64/botserver-installers
cp ./target/aarch64-apple-darwin/release/gbserver bundle/macos-arm64/botserver || true
cp ../botui/target/aarch64-apple-darwin/release/botui bundle/macos-arm64/botserver-components/ || true
cp python-installers/python-${PYTHON_VERSION}-macos-arm64.tar.gz bundle/macos-arm64/botserver-installers/
# ============================================ # ============================================
# Copy shared components to all bundles # Copy shared components to all bundles
# ============================================ # ============================================
- name: Copy botmodels to bundles - name: Copy botmodels to bundles
run: | run: |
for platform in linux-x86_64 linux-arm64 windows-x86_64 macos-x86_64 macos-arm64; do for platform in linux-x86_64 linux-arm64 windows-x86_64; do
mkdir -p bundle/$platform/botserver-components/botmodels mkdir -p bundle/$platform/botserver-components/botmodels
cp -r ../botmodels/* bundle/$platform/botserver-components/botmodels/ cp -r ../botmodels/* bundle/$platform/botserver-components/botmodels/
done done
- name: Copy botbook to bundles - name: Copy botbook to bundles
run: | run: |
for platform in linux-x86_64 linux-arm64 windows-x86_64 macos-x86_64 macos-arm64; do for platform in linux-x86_64 linux-arm64 windows-x86_64; do
mkdir -p bundle/$platform/botserver-components/botbook mkdir -p bundle/$platform/botserver-components/botbook
cp -r ../botbook/book/* bundle/$platform/botserver-components/botbook/ cp -r ../botbook/book/* bundle/$platform/botserver-components/botbook/
done done
- name: Copy installers to bundles - name: Copy installers to bundles
run: | run: |
for platform in linux-x86_64 linux-arm64 windows-x86_64 macos-x86_64 macos-arm64; do for platform in linux-x86_64 linux-arm64 windows-x86_64; do
cp -r ./botserver-installers/* bundle/$platform/botserver-installers/ cp -r ./botserver-installers/* bundle/$platform/botserver-installers/
done done
@ -240,7 +217,7 @@ jobs:
BUNDLE_VERSION=$(grep '^version' Cargo.toml | head -1 | sed 's/.*"\(.*\)".*/\1/') BUNDLE_VERSION=$(grep '^version' Cargo.toml | head -1 | sed 's/.*"\(.*\)".*/\1/')
cd bundle cd bundle
for platform in linux-x86_64 linux-arm64 windows-x86_64 macos-x86_64 macos-arm64; do for platform in linux-x86_64 linux-arm64 windows-x86_64; do
if [ -f "$platform/botserver" ] || [ -f "$platform/botserver.exe" ]; then if [ -f "$platform/botserver" ] || [ -f "$platform/botserver.exe" ]; then
zip -r "botserver-bundle-${BUNDLE_VERSION}-${platform}.zip" "$platform" zip -r "botserver-bundle-${BUNDLE_VERSION}-${platform}.zip" "$platform"
echo "Created: botserver-bundle-${BUNDLE_VERSION}-${platform}.zip" echo "Created: botserver-bundle-${BUNDLE_VERSION}-${platform}.zip"
@ -263,8 +240,6 @@ jobs:
sudo cp -r bundle/linux-x86_64 /opt/gbo/releases/botserver-bundle/unpacked/ || true sudo cp -r bundle/linux-x86_64 /opt/gbo/releases/botserver-bundle/unpacked/ || true
sudo cp -r bundle/linux-arm64 /opt/gbo/releases/botserver-bundle/unpacked/ || true sudo cp -r bundle/linux-arm64 /opt/gbo/releases/botserver-bundle/unpacked/ || true
sudo cp -r bundle/windows-x86_64 /opt/gbo/releases/botserver-bundle/unpacked/ || true sudo cp -r bundle/windows-x86_64 /opt/gbo/releases/botserver-bundle/unpacked/ || true
sudo cp -r bundle/macos-x86_64 /opt/gbo/releases/botserver-bundle/unpacked/ || true
sudo cp -r bundle/macos-arm64 /opt/gbo/releases/botserver-bundle/unpacked/ || true
sudo chmod -R 755 /opt/gbo/releases/botserver-bundle/ sudo chmod -R 755 /opt/gbo/releases/botserver-bundle/

52
.forgejo/workflows/botserver.yaml
View file

@ -31,16 +31,12 @@ jobs:
${{ runner.os }}-cargo-botserver- ${{ runner.os }}-cargo-botserver-
- name: Install Rust - name: Install Rust
uses: msrd0/rust-toolchain@v1 run: |
with: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
toolchain: stable source ~/.cargo/env
targets: >- rustup target add x86_64-unknown-linux-gnu
x86_64-unknown-linux-gnu, rustup target add aarch64-unknown-linux-gnu
aarch64-unknown-linux-gnu, rustup target add x86_64-pc-windows-gnu
x86_64-pc-windows-gnu,
aarch64-pc-windows-msvc,
x86_64-apple-darwin,
aarch64-apple-darwin
- name: Install cross-compilation dependencies - name: Install cross-compilation dependencies
run: | run: |
@ -55,42 +51,36 @@ jobs:
# Linux x86_64 # Linux x86_64
- name: Build Linux x86_64 - name: Build Linux x86_64
run: cargo build --release --locked --target x86_64-unknown-linux-gnu run: |
source ~/.cargo/env
cargo build --release --locked --target x86_64-unknown-linux-gnu
# Linux ARM64 # Linux ARM64
- name: Build Linux ARM64 - name: Build Linux ARM64
env: env:
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
run: cargo build --release --locked --target aarch64-unknown-linux-gnu run: |
source ~/.cargo/env
cargo build --release --locked --target aarch64-unknown-linux-gnu
# Windows x86_64 # Windows x86_64
- name: Build Windows x86_64 - name: Build Windows x86_64
env: env:
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc
run: cargo build --release --locked --target x86_64-pc-windows-gnu run: |
source ~/.cargo/env
# macOS x86_64 (cross-compile) cargo build --release --locked --target x86_64-pc-windows-gnu
- name: Build macOS x86_64
run: cargo build --release --locked --target x86_64-apple-darwin || echo "macOS x86_64 cross-compile requires macOS SDK"
# macOS ARM64 (cross-compile)
- name: Build macOS ARM64
run: cargo build --release --locked --target aarch64-apple-darwin || echo "macOS ARM64 cross-compile requires macOS SDK"
- name: Prepare release artifacts - name: Prepare release artifacts
run: | run: |
sudo mkdir -p /opt/gbo/releases/botserver/{linux,windows,macos} sudo mkdir -p /opt/gbo/releases/botserver/{linux,windows}
# Linux # Linux
sudo cp ./target/x86_64-unknown-linux-gnu/release/gbserver /opt/gbo/releases/botserver/linux/gbserver-x86_64 || true sudo cp ./target/x86_64-unknown-linux-gnu/release/botserver /opt/gbo/releases/botserver/linux/botserver-x86_64 || true
sudo cp ./target/aarch64-unknown-linux-gnu/release/gbserver /opt/gbo/releases/botserver/linux/gbserver-aarch64 || true sudo cp ./target/aarch64-unknown-linux-gnu/release/botserver /opt/gbo/releases/botserver/linux/botserver-aarch64 || true
# Windows # Windows
sudo cp ./target/x86_64-pc-windows-gnu/release/gbserver.exe /opt/gbo/releases/botserver/windows/gbserver-x86_64.exe || true sudo cp ./target/x86_64-pc-windows-gnu/release/botserver.exe /opt/gbo/releases/botserver/windows/botserver-x86_64.exe || true
# macOS
sudo cp ./target/x86_64-apple-darwin/release/gbserver /opt/gbo/releases/botserver/macos/gbserver-x86_64 || true
sudo cp ./target/aarch64-apple-darwin/release/gbserver /opt/gbo/releases/botserver/macos/gbserver-aarch64 || true
sudo chmod -R 755 /opt/gbo/releases/botserver/ sudo chmod -R 755 /opt/gbo/releases/botserver/
@ -98,7 +88,7 @@ jobs:
run: | run: |
lxc exec bot:pragmatismo-system -- systemctl stop system lxc exec bot:pragmatismo-system -- systemctl stop system
sudo cp ./target/x86_64-unknown-linux-gnu/release/gbserver /opt/gbo/bin/system/gbserver sudo cp ./target/x86_64-unknown-linux-gnu/release/botserver /opt/gbo/bin/system/botserver
sudo chmod +x /opt/gbo/bin/system/gbserver sudo chmod +x /opt/gbo/bin/system/botserver
lxc exec bot:pragmatismo-system -- systemctl start system lxc exec bot:pragmatismo-system -- systemctl start system