diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 63864b6..80dd1c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -235,14 +235,20 @@ jobs: fi # Desktop installers -> copy installers from dist folders - if compgen -G "artifacts/rusty-rays-desktop-dist-Windows-*/**/*" > /dev/null; then - find artifacts/rusty-rays-desktop-dist-Windows-*/ -type f -name "*.exe" -exec cp {} release-assets/desktop/ \; + # Note: actions/download-artifact creates folders named exactly after the artifact. + if [ -d artifacts/rusty-rays-desktop-dist-Windows ]; then + # Copy NSIS installer and blockmap if present + find artifacts/rusty-rays-desktop-dist-Windows -type f \ + \( -name "*.exe" -o -name "*.exe.blockmap" \) -exec cp {} release-assets/desktop/ \; fi - if compgen -G "artifacts/rusty-rays-desktop-dist-macOS-*/**/*" > /dev/null; then - find artifacts/rusty-rays-desktop-dist-macOS-*/ -type f -name "*.dmg" -exec cp {} release-assets/desktop/ \; + if [ -d artifacts/rusty-rays-desktop-dist-macOS ]; then + # Copy DMG and blockmap if present + find artifacts/rusty-rays-desktop-dist-macOS -type f \ + \( -name "*.dmg" -o -name "*.dmg.blockmap" \) -exec cp {} release-assets/desktop/ \; fi - if compgen -G "artifacts/rusty-rays-desktop-dist-Linux-*/**/*" > /dev/null; then - find artifacts/rusty-rays-desktop-dist-Linux-*/ -type f -name "*.deb" -exec cp {} release-assets/desktop/ \; + if [ -d artifacts/rusty-rays-desktop-dist-Linux ]; then + # Copy Debian package if present + find artifacts/rusty-rays-desktop-dist-Linux -type f -name "*.deb" -exec cp {} release-assets/desktop/ \; fi echo "CLI assets ready:" && ls -l release-assets/cli || true diff --git a/Cargo.lock b/Cargo.lock index 1813326..89187fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1354,7 +1354,7 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "rusty-rays-cli" -version = "0.3.0" +version = "0.3.1" dependencies = [ "clap", "ctrlc", diff --git a/rusty-rays-cli/Cargo.toml b/rusty-rays-cli/Cargo.toml index 8f1cc01..f6ea5ef 100644 --- a/rusty-rays-cli/Cargo.toml +++ b/rusty-rays-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rusty-rays-cli" -version = "0.3.0" +version = "0.3.1" edition = "2024" authors = ['William Wills'] diff --git a/rusty-rays-desktop/package-lock.json b/rusty-rays-desktop/package-lock.json index 2db841d..a9fa082 100644 --- a/rusty-rays-desktop/package-lock.json +++ b/rusty-rays-desktop/package-lock.json @@ -1,12 +1,12 @@ { "name": "rusty-rays-desktop", - "version": "0.0.1", + "version": "0.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rusty-rays-desktop", - "version": "0.0.1", + "version": "0.0.2", "hasInstallScript": true, "dependencies": { "@fontsource/archivo-black": "^5.2.8", @@ -68,6 +68,9 @@ }, "../rusty-rays-napi-node": { "version": "1.0.0", + "dev": true, + "optional": true, + "peer": true, "dependencies": { "uuid": "^13.0.0" }, @@ -109,7 +112,6 @@ "version": "7.28.5", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.5", @@ -363,6 +365,7 @@ "version": "3.4.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "commander": "^5.0.0", "glob": "^7.1.6", @@ -379,6 +382,7 @@ "version": "5.1.0", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">= 6" } @@ -387,6 +391,7 @@ "version": "7.2.3", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -592,6 +597,7 @@ "dev": true, "license": "BSD-2-Clause", "optional": true, + "peer": true, "dependencies": { "cross-dirname": "^0.1.0", "debug": "^4.3.4", @@ -611,6 +617,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -625,6 +632,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "dependencies": { "universalify": "^2.0.0" }, @@ -637,6 +645,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "engines": { "node": ">= 10.0.0" } @@ -1613,7 +1622,6 @@ "integrity": "sha512-kQJMeH87+kWJdVw8F9GQhtsageqqxrvzg7yyOw3Tx/s7v5RToe8RnKyMM+kVtBJtNAG+Xyv/z01uYQ2jiZ3GwA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/core": "^0.14.0" @@ -1656,7 +1664,6 @@ "integrity": "sha512-YoYOrnVHeX3InfgbJawAU601iTZMwEBZkyqcP1V/S33Qnz9uzH1Uj1NtC6fNgWzvX6I4XbCWwtr4RrGFb5CFrw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "^0.14.0" @@ -1671,7 +1678,6 @@ "integrity": "sha512-9WhZcofLrT0hgI7t0chf7iBQZib//0gJh9WcQMUt5+Q1Bk04dWs8vTgLNj61GBqZXgHSPzE4OpCrrLDBG8zlhQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "^0.14.0" @@ -1700,7 +1706,6 @@ "integrity": "sha512-JJz512SAILYV0M5LzBb9sbOm/XEj2fGElMiHAxb7aLI6jx+n0agxtHpfpV/AePTLm1vzzDxx6AJxXbKv355hBQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "^0.14.0", @@ -1750,7 +1755,6 @@ "integrity": "sha512-Ojtih+XIe6/XSGtpWtbAXBozhCdsDMmy+THUJAGu2x7ZgKrMS0JotN+vN2YC3nwDpYkM+yOJImQeptSfZb2Sug==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "^0.14.0" @@ -1894,7 +1898,6 @@ "integrity": "sha512-qFeMOyXE/Bk6QXN0GQo89+CB2dQcXqoxUcDb2Ah8wdYlKqpi53skABkgVy5pW3EpiprDnzNDboMltdvDslNgLQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "^0.14.0" @@ -1909,7 +1912,6 @@ "integrity": "sha512-aGaicts44bvpTcq5Dtf93/8TZFu5pMo/61lWWnYmwJJU1RqtQlxbCLEQpMyRhKDNSfPbuP8nyGmaqXlM/82J0Q==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "^0.14.0" @@ -1927,7 +1929,6 @@ "integrity": "sha512-ZcJk0hxY5ZKZDDwflqQNHEGRblgaR+piePZm7dPwPUOSeYEH31P0AwZ1ziceR74zd8N80M0TMft+e3Td6KGBHw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "^0.14.0" @@ -3848,7 +3849,6 @@ "version": "19.2.5", "devOptional": true, "license": "MIT", - "peer": true, "dependencies": { "csstype": "^3.0.2" } @@ -3857,7 +3857,6 @@ "version": "19.2.3", "devOptional": true, "license": "MIT", - "peer": true, "peerDependencies": { "@types/react": "^19.2.0" } @@ -3931,7 +3930,6 @@ "version": "8.46.4", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.46.4", "@typescript-eslint/types": "8.46.4", @@ -4441,7 +4439,6 @@ "version": "8.15.0", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -4495,7 +4492,6 @@ "version": "6.12.6", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -5238,7 +5234,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.25", "caniuse-lite": "^1.0.30001754", @@ -6057,7 +6052,8 @@ "version": "0.1.0", "dev": true, "license": "MIT", - "optional": true + "optional": true, + "peer": true }, "node_modules/cross-env": { "version": "10.1.0", @@ -6381,7 +6377,6 @@ "version": "26.0.12", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "app-builder-lib": "26.0.12", "builder-util": "26.0.11", @@ -6694,6 +6689,7 @@ "dev": true, "hasInstallScript": true, "license": "MIT", + "peer": true, "dependencies": { "@electron/asar": "^3.2.1", "debug": "^4.1.1", @@ -6712,6 +6708,7 @@ "version": "7.0.1", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "graceful-fs": "^4.1.2", "jsonfile": "^4.0.0", @@ -6850,7 +6847,6 @@ "dev": true, "hasInstallScript": true, "license": "MIT", - "peer": true, "bin": { "esbuild": "bin/esbuild" }, @@ -6955,7 +6951,6 @@ "version": "9.39.1", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -10215,6 +10210,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "dependencies": { "commander": "^9.4.0" }, @@ -10230,6 +10226,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "engines": { "node": "^12.20.0 || >=14" } @@ -10379,7 +10376,6 @@ "node_modules/react": { "version": "19.2.0", "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -10406,7 +10402,6 @@ "node_modules/react-dom": { "version": "19.2.0", "license": "MIT", - "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -10424,7 +10419,6 @@ "node_modules/react-redux": { "version": "9.2.0", "license": "MIT", - "peer": true, "dependencies": { "@types/use-sync-external-store": "^0.0.6", "use-sync-external-store": "^1.4.0" @@ -10652,8 +10646,7 @@ }, "node_modules/redux": { "version": "5.0.1", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/redux-thunk": { "version": "3.1.0", @@ -11619,6 +11612,7 @@ "version": "0.9.4", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "mkdirp": "^0.5.1", "rimraf": "~2.6.2" @@ -11672,6 +11666,7 @@ "version": "7.2.3", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -11691,6 +11686,7 @@ "version": "0.5.6", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "minimist": "^1.2.6" }, @@ -11702,6 +11698,7 @@ "version": "2.6.3", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "glob": "^7.1.3" }, @@ -11784,7 +11781,6 @@ "version": "4.0.3", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -11962,7 +11958,6 @@ "version": "5.9.3", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -12033,7 +12028,6 @@ "dev": true, "hasInstallScript": true, "license": "MIT", - "peer": true, "dependencies": { "napi-postinstall": "^0.3.0" }, @@ -12207,7 +12201,6 @@ "version": "7.2.2", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", @@ -12777,7 +12770,6 @@ "version": "4.0.3", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -12984,7 +12976,6 @@ "version": "4.1.12", "dev": true, "license": "MIT", - "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } diff --git a/rusty-rays-desktop/package.json b/rusty-rays-desktop/package.json index 22cf9df..f11a5bb 100644 --- a/rusty-rays-desktop/package.json +++ b/rusty-rays-desktop/package.json @@ -4,7 +4,7 @@ "description": "Rust based Rayshade4 ray tracer", "author": "William Wills ", "private": true, - "version": "0.0.2", + "version": "0.0.3", "type": "module", "main": "build/index.js", "scripts": { diff --git a/rusty-rays-desktop/src/renderer/components/widgets/RenderedImageCanvasWidget.tsx b/rusty-rays-desktop/src/renderer/components/widgets/RenderedImageCanvasWidget.tsx index fdd4eb8..1a04abe 100644 --- a/rusty-rays-desktop/src/renderer/components/widgets/RenderedImageCanvasWidget.tsx +++ b/rusty-rays-desktop/src/renderer/components/widgets/RenderedImageCanvasWidget.tsx @@ -220,6 +220,7 @@ const RenderedImageCanvasWidget: React.FC = ({ `, backgroundSize: '20px 20px', backgroundPosition: '0 0, 0 10px, 10px -10px, -10px 0px', + cursor: hover ? 'pointer' : 'inherit', }} />