From e4d919ad89dd5d7a87086804f95304887ed08113 Mon Sep 17 00:00:00 2001 From: Caznix Date: Sat, 11 Jan 2025 15:28:01 -0500 Subject: [PATCH] finally fix workflow i hope --- .github/workflows/rust.yml | 182 +++++++++++++++---------------- engine/Cargo.toml | 3 +- engine/src/core/repl/commands.rs | 5 +- engine/src/core/repl/handler.rs | 2 - engine/src/core/repl/mod.rs | 5 +- engine/src/core/repl/zlua.rs | 27 +++-- engine/src/core/splash.rs | 7 +- subcrates/zen_core/src/lib.rs | 8 +- 8 files changed, 113 insertions(+), 126 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3febcbc..20ebcf4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,115 +1,111 @@ name: Build Zenyx โšก - on: push: - branches: [ "main", "master" ] - pull_request: - branches: [ "main", "master" ] - + tags: ["v*"] env: CARGO_TERM_COLOR: always - jobs: - # Credit to https://github.com/Far-Beyond-Dev/Horizon/blob/main/.github/workflows/main.yml - check-version: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 2 - - name: Get binary name - id: binary - run: | - BINARY_NAME=$(cargo metadata --format-version 1 | jq -r '.packages[0].targets[] | select(.kind[] | contains("bin")) | .name') - echo "name=$BINARY_NAME" >> "$GITHUB_OUTPUT" - - name: Check version change - id: version - run: | - git fetch - OLD_VERSION=$(git show HEAD^:Cargo.toml | grep -m 1 '^version = ' | cut -d '"' -f 2) - NEW_VERSION=$(grep -m 1 '^version = ' Cargo.toml | cut -d '"' -f 2) - if [ "$OLD_VERSION" != "$NEW_VERSION" ]; then - echo "changed=true" >> "$GITHUB_OUTPUT" - echo "version=$NEW_VERSION" >> "$GITHUB_OUTPUT" - fi - - name: Create Release - if: steps.version.outputs.changed == 'true' - uses: softprops/action-gh-release@v1 - with: - tag_name: v${{ steps.version.outputs.version }} - name: Release v${{ steps.version.outputs.version }} - files: target/release/${{ steps.binary.outputs.name }} - generate_release_notes: true - draft: false - prerelease: false build: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, macos-latest, windows-latest] arch: [x86_64, aarch64] include: - arch: x86_64 target: x86_64-unknown-linux-gnu - - os: macos-latest - arch: x86_64 - target: x86_64-apple-darwin + binary_name: zenyx-linux-x86_64.zip + file_extension: "" - arch: aarch64 target: aarch64-unknown-linux-gnu - - os: macos-latest - arch: aarch64 - target: aarch64-apple-darwin + binary_name: zenyx-linux-aarch64.zip + file_extension: "" - os: windows-latest arch: x86_64 target: x86_64-pc-windows-msvc - - os: windows-latest + binary_name: zenyx-windows-x86_64.zip + file_extension: ".exe" + - os: macos-latest + arch: x86_64 + target: x86_64-apple-darwin + binary_name: zenyx-macos-x86_64.zip + file_extension: "" + - os: macos-latest arch: aarch64 - target: aarch64-pc-windows-msvc + target: aarch64-apple-darwin + binary_name: zenyx-macos-aarch64.zip + file_extension: "" runs-on: ${{ matrix.os }} - steps: - - name: ๐Ÿ“ฅ Clone repository - uses: actions/checkout@v3 - - - name: ๐Ÿ› ๏ธ Install cross-compilation dependencies (Ubuntu) - if: runner.os == 'Linux' - run: | - sudo apt-get update - sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu qemu-user - - - name: ๐Ÿ› ๏ธ Install cross-compilation dependencies (macOS๐ŸŽ) - if: runner.os == 'macOS' - run: | - brew install FiloSottile/musl-cross/musl-cross - - - name: ๐Ÿ”ง Install Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - override: true - target: ${{ matrix.target }} - profile: minimal - - - name: ๐Ÿ—๏ธ Build - uses: actions-rs/cargo@v1 - with: - command: build - args: --release --target ${{ matrix.target }} - env: - CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc - - - name: ๐Ÿงช Run tests - if: matrix.target != 'aarch64-pc-windows-msvc' - uses: actions-rs/cargo@v1 - with: - command: test - args: --target ${{ matrix.target }} - env: - CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc - QEMU_LD_PREFIX: /usr/aarch64-linux-gnu - - - name: ๐Ÿ“ฆ Upload artifacts - uses: actions/upload-artifact@v3 - with: - name: Zenyx-${{ runner.os }}-${{ matrix.arch }}-bin - path: target/${{ matrix.target }}/release/zenyx* \ No newline at end of file + - name: ๐Ÿ“ฅ Clone repository + uses: actions/checkout@v4 + - name: ๐Ÿ› ๏ธ Install cross-compilation dependencies (Ubuntu AMD) + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu qemu-user + - name: ๐Ÿ› ๏ธ Install cross-compilation dependencies (macOS๐ŸŽ) + if: runner.os == 'macOS' + run: | + brew install FiloSottile/musl-cross/musl-cross + - name: ๐Ÿ”ง Install Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + target: ${{ matrix.target }} + profile: minimal + - name: ๐Ÿ—๏ธ Build + uses: actions-rs/cargo@v1 + with: + command: build + args: --release --target ${{ matrix.target }} + env: + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc + - name: ๐Ÿ“ฆ Prepare binary and checksum + run: | + # Create temp directory for zip contents + mkdir -p temp_release + # Copy binary to temp directory + cp target/${{ matrix.target }}/release/zenyx${{ matrix.file_extension }} temp_release/zenyx${{ matrix.file_extension }} + chmod +x temp_release/zenyx${{ matrix.file_extension }} + # Create SHA256 checksum + cd temp_release + if [[ "${{ runner.os }}" == "Windows" ]]; then + certutil -hashfile zenyx${{ matrix.file_extension }} SHA256 > zenyx.sha256 + # Remove certutil's extra output, keeping only the hash + sed -i '1d' zenyx.sha256 + sed -i '2d' zenyx.sha256 + else + shasum -a 256 zenyx${{ matrix.file_extension }} > zenyx.sha256 + fi + # Create zip with both files at root level + mkdir -p ../release + zip ../release/${{ matrix.binary_name }} zenyx${{ matrix.file_extension }} zenyx.sha256 + cd .. + rm -rf temp_release + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.binary_name }} + path: release/${{ matrix.binary_name }} + release: + runs-on: ubuntu-latest + needs: build + steps: + - uses: actions/checkout@v4 + - name: Download artifacts + uses: actions/download-artifact@v4 + with: + path: release + - name: Create Release + uses: softprops/action-gh-release@v2 + with: + files: release/*/*.zip + name: Release ${{ github.ref_name }} + body: | + This is the release for version ${{ github.ref_name }}. + draft: false + prerelease: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/engine/Cargo.toml b/engine/Cargo.toml index c370b3c..446f7c0 100644 --- a/engine/Cargo.toml +++ b/engine/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "engine" +name = "zenyx" version = "0.1.0" edition = "2024" repository = "https://github.com/Zenyx-Engine/Zenyx" @@ -8,7 +8,6 @@ anyhow = "1.0.94" backtrace = "0.3.74" chrono = "0.4.39" colored = "2.2.0" -crashreport = "1.0.1" dirs-next = "2.0.0" lazy_static.workspace = true diff --git a/engine/src/core/repl/commands.rs b/engine/src/core/repl/commands.rs index 55b6447..861785d 100644 --- a/engine/src/core/repl/commands.rs +++ b/engine/src/core/repl/commands.rs @@ -1,11 +1,12 @@ use std::{fs, path::PathBuf, str::FromStr}; + +use anyhow::anyhow; use colored::Colorize; use mlua::prelude::*; -use anyhow::anyhow; use mlua::{Lua, MultiValue}; use parking_lot::RwLock; use regex::Regex; -use rustyline::{error::ReadlineError, DefaultEditor}; +use rustyline::{DefaultEditor, error::ReadlineError}; use super::{handler::Command, input::tokenize}; use crate::core::repl::handler::COMMAND_MANAGER; diff --git a/engine/src/core/repl/handler.rs b/engine/src/core/repl/handler.rs index e285c6c..3a02f5c 100644 --- a/engine/src/core/repl/handler.rs +++ b/engine/src/core/repl/handler.rs @@ -140,7 +140,6 @@ impl CommandManager { .insert(command.get_name().to_lowercase(), command); } - pub fn add_alias(&mut self, alias: &str, command: &str) { self.aliases.insert( alias.to_string().to_lowercase(), @@ -149,7 +148,6 @@ impl CommandManager { } } - pub trait Command: Send + Sync { fn execute(&self, args: Option>) -> Result<(), anyhow::Error>; fn undo(&self); diff --git a/engine/src/core/repl/mod.rs b/engine/src/core/repl/mod.rs index e3f1119..3e029fa 100644 --- a/engine/src/core/repl/mod.rs +++ b/engine/src/core/repl/mod.rs @@ -1,6 +1,4 @@ -use commands::{ - ClearCommand, CounterCommand, ExitCommand, HelpCommand, PanicCommmand,ExecFile -}; +use commands::{ClearCommand, CounterCommand, ExecFile, ExitCommand, HelpCommand, PanicCommmand}; use crate::commands; @@ -13,7 +11,6 @@ pub fn setup() { commands!( HelpCommand, ExecFile, - ClearCommand, ExitCommand, CounterCommand, diff --git a/engine/src/core/repl/zlua.rs b/engine/src/core/repl/zlua.rs index 9936db0..e895d85 100644 --- a/engine/src/core/repl/zlua.rs +++ b/engine/src/core/repl/zlua.rs @@ -1,5 +1,6 @@ -use mlua::{Function, Lua, LuaOptions, MultiValue, Number, Value::Nil}; -use rustyline::{error::ReadlineError, DefaultEditor}; +use mlua::{Lua, LuaOptions, MultiValue}; +use rustyline::{DefaultEditor, error::ReadlineError}; + use crate::core::repl::handler::Command; #[derive(Default)] @@ -9,13 +10,10 @@ impl Command for ZLua { fn execute(&self, _args: Option>) -> Result<(), anyhow::Error> { let time = chrono::Local::now().format("%H:%M:%S.%3f").to_string(); let prompt = format!("[{}/{}] {}", time, "ZLUA", ">>\t"); - let lua = Lua::new_with( - mlua::StdLib::ALL_SAFE, - LuaOptions::default() - )?; + let lua = Lua::new_with(mlua::StdLib::ALL_SAFE, LuaOptions::default())?; let globals = lua.globals(); //This just adds 2 numbers together - let add = lua.create_function(|_, (number1,number2):(i32,i32)|{ + let add = lua.create_function(|_, (number1, number2): (i32, i32)| { let result = number1 + number2; println!("{result}"); Ok(()) @@ -24,23 +22,25 @@ impl Command for ZLua { let is_equal = lua.create_function(|_, (list1, list2): (i32, i32)| { if list1 == 0 || list2 == 0 { - return Err(mlua::Error::RuntimeError("Zero values not allowed".to_string())); + return Err(mlua::Error::RuntimeError( + "Zero values not allowed".to_string(), + )); } Ok(list1 == list2) })?; globals.set("isEqual", is_equal)?; let log = lua.create_function(|_, (msg,): (String,)| { - println!("{}", msg); - Ok(()) + println!("{}", msg); + Ok(()) })?; globals.set("log", log)?; - let fail_safe = lua.create_function(|_,()|{ + let fail_safe = lua.create_function(|_, ()| { println!("Failed"); Ok(()) })?; - globals.set("failSafe",fail_safe)?; + globals.set("failSafe", fail_safe)?; let mut editor = DefaultEditor::new().expect("Failed to create editor"); loop { @@ -65,7 +65,7 @@ impl Command for ZLua { mlua::Value::Number(n) => println!("Got number: {}", n), mlua::Value::String(s) => println!("Got string: {}", s.to_str()?), mlua::Value::Boolean(b) => println!("Got boolean: {}", b), - _ => eprintln!("Got unexpected type: {:#?}", value) + _ => eprintln!("Got unexpected type: {:#?}", value), } } editor.add_history_entry(line).unwrap(); @@ -92,7 +92,6 @@ impl Command for ZLua { eprintln!("Input that caused error: {}", line); break; } - } } } diff --git a/engine/src/core/splash.rs b/engine/src/core/splash.rs index d882c87..1a920b3 100644 --- a/engine/src/core/splash.rs +++ b/engine/src/core/splash.rs @@ -1,10 +1,11 @@ use colored::Colorize; pub fn print_splash() { - println! -("# # + println!( + "# # # Welcome to the Zenyx terminal # -# #"); +# #" + ); println!( "{}", format!( diff --git a/subcrates/zen_core/src/lib.rs b/subcrates/zen_core/src/lib.rs index 1293081..1f26fe7 100644 --- a/subcrates/zen_core/src/lib.rs +++ b/subcrates/zen_core/src/lib.rs @@ -1,11 +1,7 @@ - - use thiserror::Error; -#[derive(Debug,Error)] +#[derive(Debug, Error)] enum ZError { #[error(transparent)] - Unknown(#[from] anyhow::Error) - + Unknown(#[from] anyhow::Error), } -