Skip to content

Commit

Permalink
refactor: remove deno and bump to godot 4.1 (#25)
Browse files Browse the repository at this point in the history
* refactor: remove `deno` dependency, add comms impl (incomplete), fix some hiccups, remove content manager class

* godot imports

* fix xtask export

* fix clippy and format

test

test

fix

typo

fix

fix windows

fix permissions

test

fix clippy

fix windows options
  • Loading branch information
leanmendoza authored Jul 13, 2023
1 parent 6d6b42d commit f6c58bb
Show file tree
Hide file tree
Showing 228 changed files with 1,344 additions and 782 deletions.
25 changes: 16 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ jobs:
lints:
name: Check and lints
runs-on: ubuntu-latest
env:
GODOT4_BIN: ${{ github.workspace }}/.bin/godot/godot4_bin
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
Expand All @@ -29,7 +31,7 @@ jobs:
run: gdformat -d godot/
- name: cargo xtask install
working-directory: rust
run: cargo xtask install
run: cargo xtask install --no-templates
- uses: actions-rs/cargo@v1
name: cargo check
with:
Expand All @@ -53,6 +55,8 @@ jobs:
os: [ubuntu-latest]
rust: [stable]
runs-on: ${{ matrix.os }}
env:
GODOT4_BIN: ${{ github.workspace }}/.bin/godot/godot4_bin
steps:
- name: Checkout sources
uses: actions/checkout@v2
Expand All @@ -77,7 +81,7 @@ jobs:

- name: cargo xtask install
working-directory: rust
run: cargo xtask install
run: cargo xtask install --no-templates

- name: Download grcov
run: |
Expand All @@ -96,12 +100,14 @@ jobs:

build:
name: Build and test
if: ${{ github.ref == 'refs/heads/main' }}
# Commented to test if: ${{ github.ref == 'refs/heads/main' }}
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
os: [windows-latest, ubuntu-latest]
rust: [stable]
runs-on: ${{ matrix.os }}
env:
GODOT4_BIN: ${{ github.workspace }}/.bin/godot/godot4_bin
continue-on-error: true
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -130,11 +136,6 @@ jobs:
run: |
rustup target add x86_64-apple-darwin
rustup target add aarch64-apple-darwin
- uses: actions-rs/cargo@v1
name: cargo test
with:
command: test
args: --manifest-path rust/Cargo.toml --release
- uses: actions-rs/cargo@v1
if: ${{ matrix.os != 'macos-latest' }}
Expand All @@ -157,6 +158,12 @@ jobs:
command: build
args: --manifest-path rust/Cargo.toml --release --target=aarch64-apple-darwin

- uses: actions-rs/cargo@v1
name: cargo test
with:
command: test
args: --manifest-path rust/Cargo.toml --release

- name: Make universal library
if: ${{ matrix.os == 'macos-latest' }}
run: |
Expand Down
14 changes: 7 additions & 7 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "(Windows) Launch",
"type": "cppvsdbg",
"request": "launch",
"program": "${workspaceFolder}/.bin/godot/Godot_v4.0.3-stable_win64.exe",
"program": "${workspaceFolder}/.bin/godot/godot4_bin",
"args": [
"--path",
"${workspaceFolder}/godot"
Expand All @@ -20,7 +20,7 @@
"name": "(Windows) Launch Editor",
"type": "cppvsdbg",
"request": "launch",
"program": "${workspaceFolder}/.bin/godot/Godot_v4.0.3-stable_win64.exe",
"program": "${workspaceFolder}/.bin/godot/godot4_bin",
"args": [
"--path",
"${workspaceFolder}/godot",
Expand All @@ -36,7 +36,7 @@
"name": "(Linux) Launch Editor",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/.bin/godot/Godot_v4.0.3-stable_linux.x86_64",
"program": "${workspaceFolder}/.bin/godot/godot4_bin",
"args": [
"--path",
"${workspaceFolder}/godot",
Expand All @@ -52,7 +52,7 @@
"name": "(Linux) Launch",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/.bin/godot/Godot_v4.0.3-stable_linux.x86_64",
"program": "${workspaceFolder}/.bin/godot/godot4_bin",
"args": [
"--path",
"${workspaceFolder}/godot"
Expand All @@ -76,7 +76,7 @@
"name": "(Linux) Run Test",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/.bin/godot/Godot_v4.0.3-stable_linux.x86_64",
"program": "${workspaceFolder}/.bin/godot/godot4_bin",
"args": [
"--path",
"${workspaceFolder}/godot",
Expand All @@ -101,7 +101,7 @@
"name": "(MacOS) Launch Editor",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/.bin/godot/Godot.app/Contents/MacOS/Godot",
"program": "${workspaceFolder}/.bin/godot/godot4_bin",
"args": [
"--path",
"${workspaceFolder}/godot",
Expand All @@ -117,7 +117,7 @@
"name": "(MacOS) Launch",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/.bin/godot/Godot.app/Contents/MacOS/Godot",
"program": "${workspaceFolder}/.bin/godot/godot4_bin",
"args": [
"--path",
"${workspaceFolder}/godot"
Expand Down
5 changes: 4 additions & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
],
"problemMatcher": [
"$rustc"
]
],
"env": {
"GODOT4_BIN": "${workspaceFolder}/.bin/godot/godot4_bin"
}
},
{
"label": "(win) Copy GDExtension Lib",
Expand Down
1 change: 1 addition & 0 deletions godot/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Godot 4+ specific ignores
.godot/editor
.godot/export_credentials.cfg

# Godot-specific ignores
.import/
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
48 changes: 0 additions & 48 deletions godot/.godot/exported/133200997/file_cache

This file was deleted.

6 changes: 6 additions & 0 deletions godot/.godot/global_script_class_cache.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
list=Array[Dictionary]([{
"base": &"Node",
"class": &"Comms",
"icon": "",
"language": &"GDScript",
"path": "res://src/logic/comms.gd"
}, {
"base": &"Node",
"class": &"ContentManager",
"icon": "",
"language": &"GDScript",
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="d83ab24f5cf2be8b7a9873dd64f6060a"
dest_md5="767383f5525602aff3f52a920b74282b"
dest_md5="d0dcf64e34c8d819bb8c3bd677914966"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="047217f671c9e0849c97d43e26543046"
dest_md5="f0450c91eb8acec250d6f1edb5c2dbab"
dest_md5="b68b601bcb9bd2477b96a2b9ed2927b3"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="24b516c266d7341c954cb2918f1c8f38"
dest_md5="3ebede8591768606e9089afb3bdb97a6"
dest_md5="310e4a71afceeb1675055d0a24481463"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="acc03ac1e9162f0388c005177d55d762"
dest_md5="fc36f3b951534ced3f4050f640d52ee0"
dest_md5="792e8650c8fe677e2be5ef9efa7612c5"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="5d22f337a040ae2857e36e7c5800369b"
dest_md5="de9640dd14fe0090585dd18af4f3933f"
dest_md5="505416b1e2cd4578582ef3f2c0787917"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="2bcc211c05fc425a57b2767a4cdcf174"
dest_md5="5c2bcbf1979ed9e0faf7e7720d953792"
dest_md5="db579b3ca882beaf7c2164f79712161d"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="2404a6da847c878edbc8280745365cba"
dest_md5="ab79f6bc98fe003f31d819a3399aefdb"
dest_md5="73382e44a99973f2fa8113ff14900033"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="122dd68d69fe9587e062d20d9ff5de2a"
dest_md5="a63b5bc4073ceb5a441e4538bb22b1b9"
dest_md5="e6770c065317ee457c7a5911e17a9714"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="7ab0bc06eecc1b75f8708aba3d3b044a"
dest_md5="6a40c10a8e183aa78c091684693b2ec1"
dest_md5="664cda47130f5b714f8f88ec9f06daad"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="2b26bc77c3f9432c9d4ca4911520294d"
dest_md5="d9aeeddbc5b2aa68d6d4540e3f482aa7"
dest_md5="933d17764b0aa54ee820183984371132"

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions godot/decentraland_godot_lib.gdextension
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[configuration]
entry_symbol = "gdext_rust_init"
compatibility_minimum = "4.1"

[libraries]
windows.debug.x86_64 = "res://lib/decentraland_godot_lib.dll"
Expand Down
Loading

0 comments on commit f6c58bb

Please sign in to comment.