Skip to content

Commit

Permalink
update naming
Browse files Browse the repository at this point in the history
  • Loading branch information
HexaField committed Aug 20, 2024
1 parent ac0fb4c commit bec3cb2
Show file tree
Hide file tree
Showing 40 changed files with 177 additions and 177 deletions.
6 changes: 3 additions & 3 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# These are supported funding model platforms

github: # [etherealengine]
patreon: # Replace with a single Patreon username
open_collective: etherealengine
github: ir-engine
patreon: irengine
open_collective: ir-engine
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
npm run build
npm exec electron-builder -- --publish always --linux
# npm exec electron-builder -- --publish always --linux deb AppImage
# npm exec electron-builder -- --publish always --linux rpm -c.productName=EtherealEngineControlCenter
# npm exec electron-builder -- --publish always --linux rpm -c.productName=InfiniteRealityEngineLauncher

# publish_mac:
# runs-on: macos-latest
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-microk8s-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ jobs:
ASSETS_PATH="$GITHUB_WORKSPACE/assets"
CONFIGS_PATH="/home/runner/opt/config"
FORCE_DB_REFRESH=true
ENGINE_PATH="/home/runner/opt/etherealengine"
ENGINE_PATH="/home/runner/opt/ir-engine"
CLUSTER_ID=test
OPS_PATH="/home/runner/opt/ethereal-engine-ops"
OPS_PATH="/home/runner/opt/ir-engine-ops"
PASSWORD= # Github actions run in password-less sudo mode.
ENABLE_RIPPLE_STACK=false
mkdir -p "$CONFIGS_PATH"
curl https://raw.githubusercontent.com/EtherealEngine/ethereal-engine-ops/master/configs/local.microk8s.template.values.yaml -o "$CONFIGS_PATH/test-engine.values.yaml"
sed -i "s,^\([[:space:]]*hostUploadFolder:\).*,\1 '/home/runner/opt/etherealengine/packages/server/upload'," "$CONFIGS_PATH/test-engine.values.yaml"
curl https://raw.githubusercontent.com/ir-engine/ir-engine-ops/master/configs/local.microk8s.template.values.yaml -o "$CONFIGS_PATH/test-engine.values.yaml"
sed -i "s,^\([[:space:]]*hostUploadFolder:\).*,\1 '/home/runner/opt/ir-engine/packages/server/upload'," "$CONFIGS_PATH/test-engine.values.yaml"
bash "$ASSETS_PATH/scripts/configure-microk8s-linux.sh" \
-a "$ASSETS_PATH" \
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"arrowParens": "always",
"proseWrap": "never",
"endOfLine": "lf",
"importOrder": ["<THIRD_PARTY_MODULES>", "^@etherealengine/(.*)$", "^@mui/(.*)$", "^[./]"],
"importOrder": ["<THIRD_PARTY_MODULES>", "^@ir-engine/(.*)$", "^@mui/(.*)$", "^[./]"],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
"importOrderCaseInsensitive": true
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ We currently have strict formatting rules for all `.ts` and `.tsx` files. Please

Develop on your own branch and submit PRs for review.

If you are part of the Ethereal Engine development team, please create branches on ths repository, otherwise create a fork and branches to PR.
If you are part of the iR Engine development team, please create branches on ths repository, otherwise create a fork and branches to PR.

Ensure any extraneous local project files, installs or build dependencies are removed before making a PR. You may make a separate PR for adding to the .gitignore.

Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ Want to build the spatial web on your website? Looking for a place to start? Run
**The Infinite Reality Engine Launcher is a self-contained Metaverse world in a box.**
Take what you need or launch the full stack. iR Engine Launcher is a desktop app to manage a metaverse cluster.

We know it's been complicated to build with #EtherealEngine and we've made this tool to give the community easy access to the engine for development and creation. The full Kubernetes cluster can run on Windows and any Debian Linux distro with at least 16 GB of ram.
We know it's been complicated to build with #iREngine and we've made this tool to give the community easy access to the engine for development and creation. The full Kubernetes cluster can run on Windows and any Debian Linux distro with at least 16 GB of ram.

We would love to see your creations and invite you all to come build with us. We've got a long backlog and need your help to build the Open Metaverse. Come build with us!

### [DOWNLOAD HERE](https://github.com/etherealengine/ir-engine-launcher/releases)
### [DOWNLOAD HERE](https://github.com/ir-engine/ir-engine-launcher/releases)

https://user-images.githubusercontent.com/10975502/168554732-86a202b6-053c-4588-8153-cd2c9c2771d5.mp4

### [DOWNLOAD HERE](https://github.com/etherealengine/ir-engine-launcher/releases)
### [DOWNLOAD HERE](https://github.com/ir-engine/ir-engine-launcher/releases)

## Getting Started

Expand All @@ -23,7 +23,7 @@ Additionally, there are iR Engine Launcher video tutorials which you can find [h

## Install Released

[Download latest version of the iR Engine Launcher app from here](https://github.com/etherealengine/etherealengine-control-center/releases).
[Download latest version of the iR Engine Launcher app from here](https://github.com/ir-engine/ir-engine-launcher/releases).

1. (Windows) Directly download the .exe file.
2. (Linux) For AppImage: Once downloaded, right click and go to **Properties**. In **Permissions** tab check 'Allow executing file as program'.
Expand Down Expand Up @@ -109,9 +109,9 @@ If you face an issue please report it to [Issues](https://github.com/canonical/m

1. Non-UI logs found at following path:

- on Linux: `~/.config/etherealengine-control-center/logs/main.log`
- on macOS: `~/Library/Logs/etherealengine-control-center/main.log`
- on Windows: `%USERPROFILE%\AppData\Roaming\etherealengine-control-center\logs\main.log`
- on Linux: `~/.config/ir-engine-launcher/logs/main.log`
- on macOS: `~/Library/Logs/ir-engine-launcher/main.log`
- on Windows: `%USERPROFILE%\AppData\Roaming\ir-engine-launcher\logs\main.log`

2. UI logs found using download button in app as shown in below image.
![LogsDownload](https://user-images.githubusercontent.com/10975502/219317443-5cdf19fd-1e60-4907-a124-56cec72bb633.jpg)
Expand All @@ -120,7 +120,7 @@ If you face an issue please report it to [Issues](https://github.com/canonical/m

Clone this repository:
```bash
git clone https://github.com/etherealengine/ir-engine-launcher.git ir-engine-launcher
git clone https://github.com/ir-engine/ir-engine-launcher.git ir-engine-launcher
```
Go inside the folder:
```bash
Expand Down Expand Up @@ -158,7 +158,7 @@ We are always hiring talented people who want to be leaders in what is to come.
**Your own sandbox in the Metaverse. Take what you need, or launch the full stack.
iR Engine Launcher is a desktop app for managing an iR Engine cluster.**

Electron based Ethereal Engine Server Cluster Creator app
Electron based Infinite Reality Engine Server Cluster Creator app

- Ability to fully manage an on premises server.
- Electron K8S Cluster Creator and Manager App
Expand All @@ -168,6 +168,6 @@ Electron based Ethereal Engine Server Cluster Creator app
- Multiple electron apps with same k8s control plane
- Benchmark tool - minimum specs of 4 CPU cores and 16-24GB of ram.

We [Ethereal Engine](https://github.com/etherealengine) believe that the Metaverse, Web AR, VR. XR should be easy.
We [iR Engine](https://github.com/ir-engine) believe that the Metaverse, Web AR, VR. XR should be easy.

### [Sponsorship](https://opencollective.com/etherealengine) [![Open Collective](https://opencollective.com/etherealengine/tiers/badge.svg)](https://opencollective.com/etherealengine)
### [Sponsorship](https://opencollective.com/ir-engine) [![Open Collective](https://opencollective.com/ir-engine/tiers/badge.svg)](https://opencollective.com/ir-engine)
2 changes: 1 addition & 1 deletion TUTORIALS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Ethereal Engine Control Center - Tutorials
# Infinite Reality Engine Launcher - Tutorials

## 1. Getting Started

Expand Down
50 changes: 25 additions & 25 deletions assets/scripts/check-engine-deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ OPS_FOLDER=$6
TAG=$7

#=======================
# Verify Ethereal Engine
# Verify iR Engine
#=======================

cd "$ENGINE_FOLDER" || exit
Expand All @@ -36,9 +36,9 @@ fi
PROJECTS_PATH="$ENGINE_FOLDER/packages/projects/projects/"

if [[ -d $PROJECTS_PATH ]]; then
echo "ethereal engine projects exists at $PROJECTS_PATH"
echo "ir engine projects exists at $PROJECTS_PATH"
else
echo "ethereal engine projects does not exists at $PROJECTS_PATH"
echo "ir engine projects does not exists at $PROJECTS_PATH"

RE_INIT=true
fi
Expand All @@ -48,11 +48,11 @@ export MYSQL_PORT=3304

if [[ $RE_INIT == true || $FORCE_DB_REFRESH == 'true' ]]; then
if [[ $CLUSTER_TYPE == 'minikube' ]]; then
export STORAGE_S3_STATIC_RESOURCE_BUCKET=etherealengine-minikube-static-resources
export VITE_FILE_SERVER=https://localhost:9000/etherealengine-minikube-static-resources
export STORAGE_S3_STATIC_RESOURCE_BUCKET=ir-engine-minikube-static-resources
export VITE_FILE_SERVER=https://localhost:9000/ir-engine-minikube-static-resources
else
export STORAGE_S3_STATIC_RESOURCE_BUCKET=etherealengine-microk8s-static-resources
export VITE_FILE_SERVER=https://localhost:9000/etherealengine-microk8s-static-resources
export STORAGE_S3_STATIC_RESOURCE_BUCKET=ir-engine-microk8s-static-resources
export VITE_FILE_SERVER=https://localhost:9000/ir-engine-microk8s-static-resources
fi

npm run dev-docker
Expand All @@ -61,7 +61,7 @@ fi

npm run prepare-database

echo "Ethereal Engine docker images build starting"
echo "iR Engine docker images build starting"
export DOCKER_BUILDKIT=0
export COMPOSE_DOCKER_CLI_BUILD=0

Expand Down Expand Up @@ -109,9 +109,9 @@ fi
ENGINE_INSTALLED=false
if helm status local >/dev/null; then
ENGINE_INSTALLED=true
echo "Ethereal Engine is installed"
echo "iR Engine is installed"
else
echo "Ethereal Engine is not installed"
echo "iR Engine is not installed"
fi

export MYSQL_HOST=localhost
Expand All @@ -121,15 +121,15 @@ npm run prepare-database
echo "Force DB refresh is $FORCE_DB_REFRESH"

if [[ $ENGINE_INSTALLED == true ]] && [[ $DB_EXISTS == false || $FORCE_DB_REFRESH == 'true' ]]; then
echo "Updating Ethereal Engine deployment to configure database"
echo "Updating iR Engine deployment to configure database"

helm upgrade --reuse-values -f "$OPS_FOLDER/configs/db-refresh-true.values.yaml" --set taskserver.image.tag="$TAG",api.image.tag="$TAG",instanceserver.image.tag="$TAG",testbot.image.tag="$TAG",client.image.tag="$TAG",testbot.image.tag="$TAG" local etherealengine/etherealengine
helm upgrade --reuse-values -f "$OPS_FOLDER/configs/db-refresh-true.values.yaml" --set taskserver.image.tag="$TAG",api.image.tag="$TAG",instanceserver.image.tag="$TAG",testbot.image.tag="$TAG",client.image.tag="$TAG",testbot.image.tag="$TAG" local ir-engine/ir-engine

# Added this wait to ensure previous pod is deleted.
sleep 60

# Wait until the api pod is ready
apiCount=$(kubectl get deploy local-etherealengine-api -o jsonpath='{.status.availableReplicas}')
apiCount=$(kubectl get deploy local-ir-engine-api -o jsonpath='{.status.availableReplicas}')
if [ -z "$apiCount" ]; then
apiCount=0
fi
Expand All @@ -139,24 +139,24 @@ if [[ $ENGINE_INSTALLED == true ]] && [[ $DB_EXISTS == false || $FORCE_DB_REFRES
until [ "${apiCount}" -ge 1 ]; do
sleep 5

apiCount=$(kubectl get deploy local-etherealengine-api -o jsonpath='{.status.availableReplicas}')
apiCount=$(kubectl get deploy local-ir-engine-api -o jsonpath='{.status.availableReplicas}')
if [ -z "$apiCount" ]; then
apiCount=0
fi
echo "Waiting for API pod to be ready. API ready count: $apiCount"
done

helm upgrade --reuse-values -f "$CONFIGS_FOLDER/$CLUSTER_ID-engine.values.yaml" -f "$OPS_FOLDER/configs/db-refresh-false.values.yaml" --set taskserver.image.tag="$TAG",api.image.tag="$TAG",instanceserver.image.tag="$TAG",testbot.image.tag="$TAG",client.image.tag="$TAG",testbot.image.tag="$TAG" local etherealengine/etherealengine
helm upgrade --reuse-values -f "$CONFIGS_FOLDER/$CLUSTER_ID-engine.values.yaml" -f "$OPS_FOLDER/configs/db-refresh-false.values.yaml" --set taskserver.image.tag="$TAG",api.image.tag="$TAG",instanceserver.image.tag="$TAG",testbot.image.tag="$TAG",client.image.tag="$TAG",testbot.image.tag="$TAG" local ir-engine/ir-engine
elif [[ $ENGINE_INSTALLED == true ]] && [[ $DB_EXISTS == true ]]; then
echo "Updating Ethereal Engine deployment without populating database"
echo "Updating iR Engine deployment without populating database"

helm upgrade --reuse-values -f "$CONFIGS_FOLDER/$CLUSTER_ID-engine.values.yaml" --set taskserver.image.tag="$TAG",api.image.tag="$TAG",instanceserver.image.tag="$TAG",testbot.image.tag="$TAG",client.image.tag="$TAG",testbot.image.tag="$TAG" local etherealengine/etherealengine
helm upgrade --reuse-values -f "$CONFIGS_FOLDER/$CLUSTER_ID-engine.values.yaml" --set taskserver.image.tag="$TAG",api.image.tag="$TAG",instanceserver.image.tag="$TAG",testbot.image.tag="$TAG",client.image.tag="$TAG",testbot.image.tag="$TAG" local ir-engine/ir-engine
elif [[ $ENGINE_INSTALLED == false ]] && [[ $DB_EXISTS == false || $FORCE_DB_REFRESH == 'true' ]]; then
echo "Installing Ethereal Engine deployment with populating database"
echo "Installing iR Engine deployment with populating database"

helm install -f "$CONFIGS_FOLDER/$CLUSTER_ID-engine.values.yaml" -f "$OPS_FOLDER/configs/db-refresh-true.values.yaml" --set taskserver.image.tag="$TAG",api.image.tag="$TAG",instanceserver.image.tag="$TAG",testbot.image.tag="$TAG",client.image.tag="$TAG",testbot.image.tag="$TAG" local etherealengine/etherealengine
helm install -f "$CONFIGS_FOLDER/$CLUSTER_ID-engine.values.yaml" -f "$OPS_FOLDER/configs/db-refresh-true.values.yaml" --set taskserver.image.tag="$TAG",api.image.tag="$TAG",instanceserver.image.tag="$TAG",testbot.image.tag="$TAG",client.image.tag="$TAG",testbot.image.tag="$TAG" local ir-engine/ir-engine

apiCount=$(kubectl get deploy local-etherealengine-api -o jsonpath='{.status.availableReplicas}')
apiCount=$(kubectl get deploy local-ir-engine-api -o jsonpath='{.status.availableReplicas}')
if [ -z "$apiCount" ]; then
apiCount=0
fi
Expand All @@ -166,7 +166,7 @@ elif [[ $ENGINE_INSTALLED == false ]] && [[ $DB_EXISTS == false || $FORCE_DB_REF
until [ "${apiCount}" -ge 1 ]; do
sleep 5

apiCount=$(kubectl get deploy local-etherealengine-api -o jsonpath='{.status.availableReplicas}')
apiCount=$(kubectl get deploy local-ir-engine-api -o jsonpath='{.status.availableReplicas}')
if [ -z "$apiCount" ]; then
apiCount=0
fi
Expand All @@ -175,15 +175,15 @@ elif [[ $ENGINE_INSTALLED == false ]] && [[ $DB_EXISTS == false || $FORCE_DB_REF

sleep 5

helm upgrade --reuse-values -f "$OPS_FOLDER/configs/db-refresh-false.values.yaml" --set taskserver.image.tag="$TAG",api.image.tag="$TAG",instanceserver.image.tag="$TAG",testbot.image.tag="$TAG",client.image.tag="$TAG",testbot.image.tag="$TAG" local etherealengine/etherealengine
helm upgrade --reuse-values -f "$OPS_FOLDER/configs/db-refresh-false.values.yaml" --set taskserver.image.tag="$TAG",api.image.tag="$TAG",instanceserver.image.tag="$TAG",testbot.image.tag="$TAG",client.image.tag="$TAG",testbot.image.tag="$TAG" local ir-engine/ir-engine
elif [[ $ENGINE_INSTALLED == false ]] && [[ $DB_EXISTS == true ]]; then
echo "Installing Ethereal Engine deployment without populating database"
echo "Installing iR Engine deployment without populating database"

helm install -f "$CONFIGS_FOLDER/$CLUSTER_ID-engine.values.yaml" --set taskserver.image.tag="$TAG",api.image.tag="$TAG",instanceserver.image.tag="$TAG",testbot.image.tag="$TAG",client.image.tag="$TAG",testbot.image.tag="$TAG" local etherealengine/etherealengine
helm install -f "$CONFIGS_FOLDER/$CLUSTER_ID-engine.values.yaml" --set taskserver.image.tag="$TAG",api.image.tag="$TAG",instanceserver.image.tag="$TAG",testbot.image.tag="$TAG",client.image.tag="$TAG",testbot.image.tag="$TAG" local ir-engine/ir-engine
fi

export RELEASE_NAME=local
bash ./scripts/check-engine.sh

ENGINE_STATUS=$(helm status local)
echo "Ethereal Engine status is $ENGINE_STATUS"
echo "iR Engine status is $ENGINE_STATUS"
12 changes: 6 additions & 6 deletions assets/scripts/check-engine-repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ OPS_FOLDER=$2
#=============

if [[ -d $OPS_FOLDER ]]; then
echo "ethereal engine ops repo exists at $OPS_FOLDER"
echo "iR engine ops repo exists at $OPS_FOLDER"
else
echo "cloning ethereal engine ops in $OPS_FOLDER"
git clone https://github.com/etherealengine/ethereal-engine-ops "$OPS_FOLDER"
echo "cloning iR engine ops in $OPS_FOLDER"
git clone https://github.com/ir-engine/ir-engine-ops "$OPS_FOLDER"
fi

if [[ -d $ENGINE_FOLDER ]] && [[ -f "$ENGINE_FOLDER/package.json" ]]; then
echo "ethereal engine repo exists at $ENGINE_FOLDER"
echo "iR engine repo exists at $ENGINE_FOLDER"
else
echo "cloning ethereal engine in $ENGINE_FOLDER"
git clone https://github.com/etherealengine/etherealengine "$ENGINE_FOLDER"
echo "cloning iR engine in $ENGINE_FOLDER"
git clone https://github.com/ir-engine/ir-engine "$ENGINE_FOLDER"
fi

cd "$ENGINE_FOLDER" || exit
Expand Down
Loading

0 comments on commit bec3cb2

Please sign in to comment.