Skip to content

Commit

Permalink
Fix CI bugs that appeared recently (#1272)
Browse files Browse the repository at this point in the history
  • Loading branch information
ImUrX authored Jan 2, 2025
1 parent dfeb4e7 commit 3614612
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
harfbuzz
libffi
libsoup_3
openssl
openssl.dev
pango
pkg-config
treefmt
Expand Down
1 change: 1 addition & 0 deletions gui/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ yarn-error.log*
# vite
/dist
/stats.html
vite.config.ts.timestamp*

# eslint
.eslintcache
4 changes: 3 additions & 1 deletion gui/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'}`);

Expand Down

0 comments on commit 3614612

Please sign in to comment.