Skip to content

Commit

Permalink
Merge pull request #3977 from KBVE/alpha
Browse files Browse the repository at this point in the history
Preparing Beta Branch
  • Loading branch information
h0lybyte authored Feb 18, 2025
2 parents 1723159 + 04e0bee commit d25d5ec
Show file tree
Hide file tree
Showing 12 changed files with 178 additions and 5 deletions.
15 changes: 14 additions & 1 deletion .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
fudster: ${{ steps.delta.outputs.fudster_any_changed }}
laser: ${{ steps.delta.outputs.laser_any_changed }}
worker: ${{ steps.delta.outputs.worker_any_changed }}

q: ${{ steps.delta.outputs.q_any_changed }}
steps:
- name: Checkout the repository using git
uses: actions/checkout@v4
Expand Down Expand Up @@ -111,6 +111,8 @@ jobs:
- 'apps/cryptothrone.com/src/**'
laser:
- 'packages/laser/package.json'
q:
- 'packages/rust/q/README.md'
debug:
needs: ['alter', 'globals']
Expand Down Expand Up @@ -750,6 +752,17 @@ jobs:
# pull_request_title: 'jedi-crates-minor-version-bump-${{ needs.globals.outputs.sha256head }}'
# pull_request_body: 'Bumping up the minor version of the jedi package.'

# Q Release

qrelease:
needs: ['deploy', 'alter', 'globals']
if: needs.alter.outputs.q == 'true'
uses: ./.github/workflows/resuable/packages/rust-publish-crate.yml
with:
package: q
secrets:
CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }}

python_atlas_publish:
needs: ['deploy', 'alter', 'python_atlas_build']
name: Atlas KBVE Pypi Publish
Expand Down
Empty file.
Empty file.
35 changes: 35 additions & 0 deletions .github/workflows/resuable/packages/rust-publish-crate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Rust Crate Publish

on:
workflow_call:
inputs:
package:
required: true
type: string
secrets:
CRATES_TOKEN:
required: true

jobs:
publish:
runs-on: ubuntu-latest
permissions:
id-token: write
contents: write
packages: write
issues: write
pull-requests: write

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Rust ToolChain
uses: dtolnay/rust-toolchain@stable

- name: Cargo Login
run: cargo login ${{ secrets.CRATES_TOKEN }}

- name: Cargo Publish
run: |
cargo publish -p ${{ inputs.package }}
4 changes: 0 additions & 4 deletions .github/workflows/rust-dll-tower-defense-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ jobs:
- name: List Downloaded Files
run: ls -R temp_dll

- name: Extract DLL
run: |
unzip temp_dll/rust_godot_towerdefense.zip -d temp_dll
- name: Replace Existing DLL
run: |
cp temp_dll/rust_godot_towerdefense.dll apps/rentearth/rust_godot_towerdefense/godot/addons/tower-defense/windows/rust_godot_towerdefense.dll
Expand Down
20 changes: 20 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ members = [
'apps/experimental/rust_wasm_embed',
'apps/experimental/rust_p16_gameserver',
'apps/rentearth/rust_godot_towerdefense',
'packages/rust/q',
]

[profile.dev]
Expand Down
Binary file not shown.
51 changes: 51 additions & 0 deletions packages/rust/q/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
[package]
name = "q"
authors = ["kbve", "h0lybyte"]
version = "0.1.0"
edition = "2021"
license = "MIT"
description = "Q is a Godot Helper Crate."
homepage = "https://kbve.com/"
repository = "https://github.com/KBVE/kbve/tree/main/packages/erust"
readme = "README.md"
rust-version = "1.75"

[lib]
crate-type = ["cdylib"]

[dependencies]
rand = "0.8"
godot = { version = "0.2.2", features = ["experimental-wasm", "lazy-function-tables"] }
bevy_ecs = { version = "0.15.1", features = ["default"] }
rstar = "0.12.2"
papaya = "0.1.8"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"


[target."cfg(target_os = \"macos\")".dependencies]
objc2 = "0.6.0"
wry = { version = "0.46.2", features = ["transparent", "devtools"] }
raw-window-handle = "0.6.2"
http = "1.1.0"
infer = "0.16.0"


[target."cfg(target_os = \"windows\")".dependencies]
windows = { version = "0.59", features = [
"Data_Xml_Dom",
"Win32_Security",
"Win32_System_Threading",
"Win32_UI_WindowsAndMessaging",
] }
wry = { version = "0.48.1", features = ["transparent", "devtools"] }
raw-window-handle = "0.6.2"
http = "1.1.0"
infer = "0.16.0"


[profile.release]
opt-level = 'z'
lto = "fat"
codegen-units = 1
debug = false
3 changes: 3 additions & 0 deletions packages/rust/q/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Q

Q is a Godot Extensions Helper Library
46 changes: 46 additions & 0 deletions packages/rust/q/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"name": "q",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"sourceRoot": "packages/rust/q/src",
"targets": {
"build": {
"executor": "@monodon/rust:build",
"outputs": [
"{options.target-dir}"
],
"options": {
"target-dir": "dist/target/q"
},
"configurations": {
"production": {
"release": true
}
}
},
"test": {
"executor": "@monodon/rust:test",
"outputs": [
"{options.target-dir}"
],
"options": {
"target-dir": "dist/target/q"
},
"configurations": {
"production": {
"release": true
}
}
},
"lint": {
"executor": "@monodon/rust:lint",
"outputs": [
"{options.target-dir}"
],
"options": {
"target-dir": "dist/target/q"
}
}
},
"tags": []
}
8 changes: 8 additions & 0 deletions packages/rust/q/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#[cfg(test)]
mod tests {
#[test]
fn it_works() {
let result = 2 + 2;
assert_eq!(result, 4);
}
}

0 comments on commit d25d5ec

Please sign in to comment.