From 4c3eb98041ae56e9f1eb8fe66778e5855852ca4a Mon Sep 17 00:00:00 2001 From: JackEnx <167036558+JackEnx@users.noreply.github.com> Date: Tue, 17 Dec 2024 15:48:11 -0300 Subject: [PATCH] refactor: rpc url to a generic url --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- src/main/services/process-watcher.ts | 4 +++- src/main/vite-env.d.ts | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20d904c9..a94eef96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: RENDERER_VITE_INTERCOM_APP_ID: ${{ vars.RENDERER_VITE_INTERCOM_APP_ID }} RENDERER_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.RENDERER_VITE_EXTERNAL_RESOURCES_URL }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MAIN_VITE_RPC_GAME_EXECUTABLES_URL: ${{ vars.MAIN_VITE_RPC_GAME_EXECUTABLES_URL }} + MAIN_VITE_EXTERNAL_RESOURCES: ${{ vars.MAIN_VITE_EXTERNAL_RESOURCES }} - name: Build Windows if: matrix.os == 'windows-latest' @@ -63,7 +63,7 @@ jobs: RENDERER_VITE_INTERCOM_APP_ID: ${{ vars.RENDERER_VITE_INTERCOM_APP_ID }} RENDERER_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.RENDERER_VITE_EXTERNAL_RESOURCES_URL }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MAIN_VITE_RPC_GAME_EXECUTABLES_URL: ${{ vars.MAIN_VITE_RPC_GAME_EXECUTABLES_URL }} + MAIN_VITE_EXTERNAL_RESOURCES: ${{ vars.MAIN_VITE_EXTERNAL_RESOURCES }} - name: Create artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c36b75d7..e8396d71 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,7 +49,7 @@ jobs: RENDERER_VITE_INTERCOM_APP_ID: ${{ vars.RENDERER_VITE_INTERCOM_APP_ID }} RENDERER_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.RENDERER_VITE_EXTERNAL_RESOURCES_URL }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MAIN_VITE_RPC_GAME_EXECUTABLES_URL: ${{ vars.MAIN_VITE_RPC_GAME_EXECUTABLES_URL }} + MAIN_VITE_EXTERNAL_RESOURCES: ${{ vars.MAIN_VITE_EXTERNAL_RESOURCES }} - name: Build Windows if: matrix.os == 'windows-latest' run: yarn build:win @@ -61,7 +61,7 @@ jobs: RENDERER_VITE_INTERCOM_APP_ID: ${{ vars.RENDERER_VITE_INTERCOM_APP_ID }} RENDERER_VITE_EXTERNAL_RESOURCES_URL: ${{ vars.RENDERER_VITE_EXTERNAL_RESOURCES_URL }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MAIN_VITE_RPC_GAME_EXECUTABLES_URL: ${{ vars.MAIN_VITE_RPC_GAME_EXECUTABLES_URL }} + MAIN_VITE_EXTERNAL_RESOURCES: ${{ vars.MAIN_VITE_EXTERNAL_RESOURCES }} - name: Create artifact uses: actions/upload-artifact@v4 with: diff --git a/src/main/services/process-watcher.ts b/src/main/services/process-watcher.ts index 6026527c..19b3bc85 100644 --- a/src/main/services/process-watcher.ts +++ b/src/main/services/process-watcher.ts @@ -33,7 +33,9 @@ let currentTick = 1; const gameExecutables = ( await axios - .get(import.meta.env.MAIN_VITE_RPC_GAME_EXECUTABLES_URL) + .get( + import.meta.env.MAIN_VITE_EXTERNAL_RESOURCES + "/game-executables.json" + ) .catch(() => { return { data: {} }; }) diff --git a/src/main/vite-env.d.ts b/src/main/vite-env.d.ts index 415250f0..95e1e545 100644 --- a/src/main/vite-env.d.ts +++ b/src/main/vite-env.d.ts @@ -6,7 +6,7 @@ interface ImportMetaEnv { readonly MAIN_VITE_ANALYTICS_API_URL: string; readonly MAIN_VITE_AUTH_URL: string; readonly MAIN_VITE_CHECKOUT_URL: string; - readonly MAIN_VITE_RPC_GAME_EXECUTABLES_URL: string; + readonly MAIN_VITE_EXTERNAL_RESOURCES: string; } interface ImportMeta {