From 3614612ac2ba65d9e4f776e005fdea3f0d8cfb8a Mon Sep 17 00:00:00 2001 From: Uriel Date: Thu, 2 Jan 2025 23:29:21 +0100 Subject: [PATCH] Fix CI bugs that appeared recently (#1272) --- .github/workflows/gradle.yaml | 2 +- flake.nix | 2 +- gui/.gitignore | 1 + gui/vite.config.ts | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle.yaml b/.github/workflows/gradle.yaml index 3e90c7d18e..9d1b711612 100644 --- a/.github/workflows/gradle.yaml +++ b/.github/workflows/gradle.yaml @@ -285,7 +285,7 @@ jobs: ./bundle_dmg.sh --volname SlimeVR --icon slimevr 180 170 --app-drop-link 480 170 \ --window-size 660 400 --hide-extension ../macos/SlimeVR.app \ --volicon ../macos/SlimeVR.app/Contents/Resources/icon.icns --skip-jenkins \ - --eula ../../../../LICENSE-MIT slimevr.dmg ../macos/SlimeVR.app + --eula ../../../../../LICENSE-MIT slimevr.dmg ../macos/SlimeVR.app - uses: actions/upload-artifact@v4 with: diff --git a/flake.nix b/flake.nix index 809182a6c7..2bdecbac9d 100644 --- a/flake.nix +++ b/flake.nix @@ -92,7 +92,7 @@ harfbuzz libffi libsoup_3 - openssl + openssl.dev pango pkg-config treefmt diff --git a/gui/.gitignore b/gui/.gitignore index a1ac58f664..90069ef5a6 100644 --- a/gui/.gitignore +++ b/gui/.gitignore @@ -28,6 +28,7 @@ yarn-error.log* # vite /dist /stats.html +vite.config.ts.timestamp* # eslint .eslintcache diff --git a/gui/vite.config.ts b/gui/vite.config.ts index 0d17119671..a61b5476e1 100644 --- a/gui/vite.config.ts +++ b/gui/vite.config.ts @@ -10,7 +10,9 @@ const versionTag = execSync('git --no-pager tag --sort -taggerdate --points-at H .split('\n')[0] .trim(); // If not empty then it's not clean -const gitClean = execSync('git status --porcelain').toString() ? false : true; +const gitCleanString = execSync('git status --porcelain').toString(); +const gitClean = gitCleanString ? false : true; +if (!gitClean) console.log('Git is dirty because of:\n' + gitCleanString); console.log(`version is ${versionTag || commitHash}${gitClean ? '' : '-dirty'}`);