Libretro cores config in yaml (#392)

Removes separate config files for Libretro cores stored in the cores folder and replaces them with options in the main config.yaml file.

.github/workflows/build.yml

@@ -23,9 +23,9 @@ jobs:
         step: [ build, check ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v4
         with:
           go-version: ^1.20
 
@@ -101,7 +101,7 @@ jobs:
         run: |
           make verify-cores
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: matrix.step == 'check' && always()
         with:
           name: emulator-test-frames
@@ -112,5 +112,5 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: docker build --build-arg VERSION=$(./scripts/version.sh) .

.github/workflows/cd/cloudretro.io/config.yaml

@@ -0,0 +1,24 @@
+version: 4
+
+coordinator:
+  debug: true
+  server:
+    address:
+    https: true
+    tls:
+      domain: usw.cloudretro.io
+  analytics:
+    inject: true
+    gtag: UA-145078282-1
+
+worker:
+  debug: true
+  network:
+    coordinatorAddress: usw.cloudretro.io
+    publicAddress: usw.cloudretro.io
+    secure: true
+  server:
+    https: true
+    tls:
+      address: :444
+      domain: usw.cloudretro.io

.github/workflows/cd/cloudretro.io/coordinator.env

@@ -1,6 +0,0 @@
-CLOUD_GAME_COORDINATOR_ANALYTICS_GTAG=UA-145078282-1
-CLOUD_GAME_COORDINATOR_ANALYTICS_INJECT=true
-CLOUD_GAME_COORDINATOR_SERVER_ADDRESS=
-CLOUD_GAME_COORDINATOR_SERVER_HTTPS=true
-CLOUD_GAME_COORDINATOR_SERVER_TLS_DOMAIN=usw.cloudretro.io
-CLOUD_GAME_COORDINATOR_DEBUG=true

.github/workflows/cd/cloudretro.io/worker.env

@@ -1,8 +0,0 @@
-CLOUD_GAME_WORKER_NETWORK_COORDINATORADDRESS=usw.cloudretro.io
-CLOUD_GAME_WORKER_NETWORK_PUBLICADDRESS=usw.cloudretro.io
-CLOUD_GAME_WORKER_NETWORK_SECURE=true
-CLOUD_GAME_WORKER_SERVER_ADDRESS=:80
-CLOUD_GAME_WORKER_SERVER_HTTPS=true
-CLOUD_GAME_WORKER_SERVER_TLS_ADDRESS=:444
-CLOUD_GAME_WORKER_SERVER_TLS_DOMAIN=usw.cloudretro.io
-CLOUD_GAME_WORKER_DEBUG=true

.github/workflows/cd/deploy-app.sh

@@ -72,6 +72,7 @@ WORKERS=${WORKERS:-4}
 USER=${USER:-root}
 
 compose_src=$(cat $LOCAL_WORK_DIR/docker-compose.yml)
+config_src=$(cat $LOCAL_WORK_DIR/configs/config.yaml)
 
 function remote_run_commands() {
   ret=""
@@ -171,7 +172,14 @@ for ip in $IP_LIST; do
 
   # build Docker container env file
   run_env=""
+  custom_config=""
   if [[ ! -z "${ENV_DIR}" ]]; then
+    env_f=$ENV_DIR/config.yaml
+    if [[ -e "$env_f" ]]; then
+        echo "config.yaml found"
+        custom_config=$(cat $env_f)
+    fi
+
     if [ $deploy_coordinator == 1 ]; then
       env_f=$ENV_DIR/coordinator.env
       if [[ -e "$env_f" ]]; then
@@ -216,11 +224,10 @@ for ip in $IP_LIST; do
     docker compose version; \
     mkdir -p $REMOTE_WORK_DIR; \
     cd $REMOTE_WORK_DIR; \
+    mkdir -p $REMOTE_WORK_DIR/home; \
+    echo \"$custom_config\" > $REMOTE_WORK_DIR/home/config.yaml; \
     echo '$compose_src' > ./docker-compose.yml; \
-    echo '$run_env' > ./run.env; \
-    docker image prune -f -a; \
+    docker compose stop; \
     IMAGE_TAG=$DOCKER_IMAGE_TAG docker compose pull; \
-    echo '$run' > ./run.sh; \
-    chmod +x ./run.sh; \
-    ./run.sh"
+    docker compose up -d;"
 done

.github/workflows/cd/docker-compose.yml

@@ -1,8 +1,7 @@
-version: "3.4"
+version: "3.9"
 
 x-params:
   &default-params
-  env_file: run.env
   image: ghcr.io/giongto35/cloud-game/cloud-game:${IMAGE_TAG:-latest}
   network_mode: "host"
   privileged: true
@@ -10,8 +9,8 @@ x-params:
   logging:
     driver: "json-file"
     options:
-      max-size: "64m"
-      max-file: "5"
+      max-size: "32m"
+      max-file: "4"
       compress: "true"
 
 services:
@@ -29,11 +28,11 @@ services:
       - coordinator
     deploy:
       mode: replicated
-      replicas: ${WORKER_REPLICAS:-4}
+      replicas: 4
     environment:
       - MESA_GL_VERSION_OVERRIDE=3.3
     #entrypoint: [ "/bin/sh", "-c", "xvfb-run -a $$@", "" ]
-    command: worker --zone=${ZONE:-}
+    command: worker
     volumes:
       - ${APP_DIR:-/cloud-game}/cache:/usr/local/share/cloud-game/assets/cache
       - ${APP_DIR:-/cloud-game}/cores:/usr/local/share/cloud-game/assets/cores

.github/workflows/deploy.yml

@@ -16,7 +16,7 @@ jobs:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           known_hosts: 'PLACEHOLDER'
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Deploy to all servers
         env:

.github/workflows/docker_publish_stable.yml

@@ -13,7 +13,7 @@ jobs:
   docker-publish-stable:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
 

.github/workflows/docker_publish_unstable.yml

@@ -13,7 +13,7 @@ jobs:
   docker-publish-unstable:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - run: echo "V=$(./scripts/version.sh)" >> $GITHUB_ENV
 

.github/workflows/release.yml_

@@ -37,9 +37,9 @@ jobs:
     env:
       release-dir: _release
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v4
         with:
           go-version: ^1.20