From 1b94a9effa77a056e0980eec90b709e66fa634be Mon Sep 17 00:00:00 2001 From: Raphiiko Date: Fri, 5 May 2023 18:32:48 +0200 Subject: [PATCH] Fix build --- .github/workflows/build-development.yml | 2 +- .github/workflows/pr-and-feature-check.yml | 2 +- src-elevated-sidecar/Cargo.lock | 4 +- src/assets/preload-assets.json | 14 +- src/assets/splashscreen/splash-blurhash.css | 138 +------------------- 5 files changed, 6 insertions(+), 154 deletions(-) diff --git a/.github/workflows/build-development.yml b/.github/workflows/build-development.yml index 36d2ba74..25888a87 100644 --- a/.github/workflows/build-development.yml +++ b/.github/workflows/build-development.yml @@ -69,7 +69,7 @@ jobs: version: Unreleased path: ./CHANGELOG.md - name: Build and release Oyasumi development build - uses: Raphiiko/tauri-action@dev + uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} diff --git a/.github/workflows/pr-and-feature-check.yml b/.github/workflows/pr-and-feature-check.yml index 366a228c..517b1831 100644 --- a/.github/workflows/pr-and-feature-check.yml +++ b/.github/workflows/pr-and-feature-check.yml @@ -60,7 +60,7 @@ jobs: cargo clippy --all-features --no-deps # Check Rust code in core module rm src-elevated-sidecar/target/release/oyasumi-elevated-sidecar*.exe # Clean up dummy sidecar executable(s) - name: Test if Oyasumi compiles - uses: Raphiiko/tauri-action@dev + uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} diff --git a/src-elevated-sidecar/Cargo.lock b/src-elevated-sidecar/Cargo.lock index c4a4005f..a235d4c8 100644 --- a/src-elevated-sidecar/Cargo.lock +++ b/src-elevated-sidecar/Cargo.lock @@ -678,7 +678,7 @@ dependencies = [ [[package]] name = "oyasumi-elevated-sidecar" -version = "1.6.0" +version = "1.7.0" dependencies = [ "codesigned", "directories", @@ -697,7 +697,7 @@ dependencies = [ [[package]] name = "oyasumi-shared" -version = "1.6.0" +version = "1.7.0" dependencies = [ "openvr", "serde", diff --git a/src/assets/preload-assets.json b/src/assets/preload-assets.json index 853c7000..427e6563 100644 --- a/src/assets/preload-assets.json +++ b/src/assets/preload-assets.json @@ -1,13 +1 @@ -{ - "imageUrls": [ - "/assets/img/about_bg.jpg", - "/assets/img/afterburner_icon.png", - "/assets/img/icon_150x150.png", - "/assets/img/raphiiko.png", - "/assets/img/sleeping-person.png", - "/assets/img/steamvr_icon.png", - "/assets/img/vrc_icon.png", - "/assets/img/vrc_icon_stencil.png", - "https://avatars.githubusercontent.com/u/111654848" - ] -} +{"imageUrls":["/assets/img/about_bg.jpg","/assets/img/afterburner_icon.png","/assets/img/icon_150x150.png","/assets/img/raphiiko.png","/assets/img/sleeping-person.png","/assets/img/steamvr_icon.png","/assets/img/vrc_icon.png","/assets/img/vrc_icon_stencil.png","https://avatars.githubusercontent.com/u/111654848"]} \ No newline at end of file diff --git a/src/assets/splashscreen/splash-blurhash.css b/src/assets/splashscreen/splash-blurhash.css index 47f5c28f..a5bd6039 100644 --- a/src/assets/splashscreen/splash-blurhash.css +++ b/src/assets/splashscreen/splash-blurhash.css @@ -1,138 +1,2 @@ /* GENERATED FILE, DO NOT EDIT!*/ -.splash-blurhash { - background-image: linear-gradient( - 90deg, - rgb(215, 185, 151) 10%, - rgb(203, 173, 141) 10% 20%, - rgb(169, 141, 112) 20% 30%, - rgb(122, 92, 67) 30% 40%, - rgb(77, 43, 1) 40% 50%, - rgb(73, 47, 1) 50% 60%, - rgb(95, 77, 50) 60% 70%, - rgb(108, 90, 70) 70% 80%, - rgb(103, 81, 70) 80% 90%, - rgb(86, 55, 60) 90% 100% - ), - linear-gradient( - 90deg, - rgb(202, 174, 142) 10%, - rgb(191, 163, 132) 10% 20%, - rgb(160, 133, 105) 20% 30%, - rgb(117, 88, 62) 30% 40%, - rgb(78, 46, 1) 40% 50%, - rgb(74, 53, 21) 50% 60%, - rgb(94, 81, 59) 60% 70%, - rgb(104, 92, 77) 70% 80%, - rgb(98, 85, 78) 80% 90%, - rgb(81, 64, 71) 90% 100% - ), - linear-gradient( - 90deg, - rgb(168, 145, 118) 10%, - rgb(160, 136, 109) 10% 20%, - rgb(137, 111, 86) 20% 30%, - rgb(106, 77, 52) 30% 40%, - rgb(82, 56, 29) 40% 50%, - rgb(81, 68, 51) 50% 60%, - rgb(92, 89, 77) 60% 70%, - rgb(97, 99, 92) 70% 80%, - rgb(89, 95, 95) 80% 90%, - rgb(73, 83, 91) 90% 100% - ), - linear-gradient( - 90deg, - rgb(128, 110, 88) 10%, - rgb(123, 104, 81) 10% 20%, - rgb(112, 88, 63) 20% 30%, - rgb(99, 71, 44) 30% 40%, - rgb(93, 70, 49) 40% 50%, - rgb(95, 85, 73) 50% 60%, - rgb(98, 101, 94) 60% 70%, - rgb(97, 109, 107) 70% 80%, - rgb(90, 107, 111) 80% 90%, - rgb(79, 101, 110) 90% 100% - ), - linear-gradient( - 90deg, - rgb(113, 94, 72) 10%, - rgb(111, 90, 67) 10% 20%, - rgb(108, 82, 54) 20% 30%, - rgb(106, 77, 48) 30% 40%, - rgb(107, 84, 62) 40% 50%, - rgb(110, 99, 86) 50% 60%, - rgb(113, 112, 106) 60% 70%, - rgb(112, 118, 117) 70% 80%, - rgb(107, 118, 122) 80% 90%, - rgb(101, 114, 121) 90% 100% - ), - linear-gradient( - 90deg, - rgb(135, 109, 84) 10%, - rgb(132, 106, 78) 10% 20%, - rgb(125, 97, 66) 20% 30%, - rgb(120, 90, 59) 30% 40%, - rgb(119, 94, 70) 40% 50%, - rgb(123, 106, 91) 50% 60%, - rgb(128, 118, 110) 60% 70%, - rgb(130, 124, 121) 70% 80%, - rgb(129, 123, 125) 80% 90%, - rgb(126, 119, 124) 90% 100% - ), - linear-gradient( - 90deg, - rgb(160, 129, 100) 10%, - rgb(155, 124, 95) 10% 20%, - rgb(142, 111, 80) 20% 30%, - rgb(128, 99, 67) 30% 40%, - rgb(122, 96, 70) 40% 50%, - rgb(126, 106, 87) 50% 60%, - rgb(135, 117, 106) 60% 70%, - rgb(141, 123, 117) 70% 80%, - rgb(142, 122, 121) 80% 90%, - rgb(140, 118, 120) 90% 100% - ), - linear-gradient( - 90deg, - rgb(166, 135, 106) 10%, - rgb(160, 129, 99) 10% 20%, - rgb(144, 113, 83) 20% 30%, - rgb(125, 95, 65) 30% 40%, - rgb(115, 88, 61) 40% 50%, - rgb(119, 96, 76) 50% 60%, - rgb(130, 108, 95) 60% 70%, - rgb(138, 115, 107) 70% 80%, - rgb(140, 114, 112) 80% 90%, - rgb(138, 109, 111) 90% 100% - ), - linear-gradient( - 90deg, - rgb(151, 122, 96) 10%, - rgb(145, 116, 90) 10% 20%, - rgb(128, 99, 73) 20% 30%, - rgb(108, 79, 51) 30% 40%, - rgb(96, 70, 43) 40% 50%, - rgb(100, 78, 58) 50% 60%, - rgb(112, 92, 79) 60% 70%, - rgb(121, 100, 93) 70% 80%, - rgb(123, 101, 99) 80% 90%, - rgb(122, 97, 101) 90% 100% - ), - linear-gradient( - 90deg, - rgb(122, 98, 77) 10%, - rgb(116, 92, 71) 10% 20%, - rgb(101, 75, 53) 20% 30%, - rgb(82, 53, 25) 30% 40%, - rgb(71, 43, 9) 40% 50%, - rgb(75, 56, 37) 50% 60%, - rgb(87, 73, 62) 60% 70%, - rgb(96, 84, 79) 70% 80%, - rgb(98, 87, 88) 80% 90%, - rgb(97, 85, 92) 90% 100% - ); - background-position: 0 0, 0 11%, 0 22%, 0 33%, 0 44%, 0 56%, 0 67%, 0 78%, 0 89%, 0 100%; - background-repeat: no-repeat; - background-size: 100% 10%; - filter: blur(24px); - transform: scale(1.2); -} +.splash-blurhash{background-image:linear-gradient(90deg,rgb(215,185,151) 10%,rgb(203,173,141) 10% 20%,rgb(169,141,112) 20% 30%,rgb(122,92,67) 30% 40%,rgb(77,43,1) 40% 50%,rgb(73,47,1) 50% 60%,rgb(95,77,50) 60% 70%,rgb(108,90,70) 70% 80%,rgb(103,81,70) 80% 90%,rgb(86,55,60) 90% 100%),linear-gradient(90deg,rgb(202,174,142) 10%,rgb(191,163,132) 10% 20%,rgb(160,133,105) 20% 30%,rgb(117,88,62) 30% 40%,rgb(78,46,1) 40% 50%,rgb(74,53,21) 50% 60%,rgb(94,81,59) 60% 70%,rgb(104,92,77) 70% 80%,rgb(98,85,78) 80% 90%,rgb(81,64,71) 90% 100%),linear-gradient(90deg,rgb(168,145,118) 10%,rgb(160,136,109) 10% 20%,rgb(137,111,86) 20% 30%,rgb(106,77,52) 30% 40%,rgb(82,56,29) 40% 50%,rgb(81,68,51) 50% 60%,rgb(92,89,77) 60% 70%,rgb(97,99,92) 70% 80%,rgb(89,95,95) 80% 90%,rgb(73,83,91) 90% 100%),linear-gradient(90deg,rgb(128,110,88) 10%,rgb(123,104,81) 10% 20%,rgb(112,88,63) 20% 30%,rgb(99,71,44) 30% 40%,rgb(93,70,49) 40% 50%,rgb(95,85,73) 50% 60%,rgb(98,101,94) 60% 70%,rgb(97,109,107) 70% 80%,rgb(90,107,111) 80% 90%,rgb(79,101,110) 90% 100%),linear-gradient(90deg,rgb(113,94,72) 10%,rgb(111,90,67) 10% 20%,rgb(108,82,54) 20% 30%,rgb(106,77,48) 30% 40%,rgb(107,84,62) 40% 50%,rgb(110,99,86) 50% 60%,rgb(113,112,106) 60% 70%,rgb(112,118,117) 70% 80%,rgb(107,118,122) 80% 90%,rgb(101,114,121) 90% 100%),linear-gradient(90deg,rgb(135,109,84) 10%,rgb(132,106,78) 10% 20%,rgb(125,97,66) 20% 30%,rgb(120,90,59) 30% 40%,rgb(119,94,70) 40% 50%,rgb(123,106,91) 50% 60%,rgb(128,118,110) 60% 70%,rgb(130,124,121) 70% 80%,rgb(129,123,125) 80% 90%,rgb(126,119,124) 90% 100%),linear-gradient(90deg,rgb(160,129,100) 10%,rgb(155,124,95) 10% 20%,rgb(142,111,80) 20% 30%,rgb(128,99,67) 30% 40%,rgb(122,96,70) 40% 50%,rgb(126,106,87) 50% 60%,rgb(135,117,106) 60% 70%,rgb(141,123,117) 70% 80%,rgb(142,122,121) 80% 90%,rgb(140,118,120) 90% 100%),linear-gradient(90deg,rgb(166,135,106) 10%,rgb(160,129,99) 10% 20%,rgb(144,113,83) 20% 30%,rgb(125,95,65) 30% 40%,rgb(115,88,61) 40% 50%,rgb(119,96,76) 50% 60%,rgb(130,108,95) 60% 70%,rgb(138,115,107) 70% 80%,rgb(140,114,112) 80% 90%,rgb(138,109,111) 90% 100%),linear-gradient(90deg,rgb(151,122,96) 10%,rgb(145,116,90) 10% 20%,rgb(128,99,73) 20% 30%,rgb(108,79,51) 30% 40%,rgb(96,70,43) 40% 50%,rgb(100,78,58) 50% 60%,rgb(112,92,79) 60% 70%,rgb(121,100,93) 70% 80%,rgb(123,101,99) 80% 90%,rgb(122,97,101) 90% 100%),linear-gradient(90deg,rgb(122,98,77) 10%,rgb(116,92,71) 10% 20%,rgb(101,75,53) 20% 30%,rgb(82,53,25) 30% 40%,rgb(71,43,9) 40% 50%,rgb(75,56,37) 50% 60%,rgb(87,73,62) 60% 70%,rgb(96,84,79) 70% 80%,rgb(98,87,88) 80% 90%,rgb(97,85,92) 90% 100%);background-position:0 0,0 11%,0 22%,0 33%,0 44%,0 56%,0 67%,0 78%,0 89%,0 100%;background-repeat:no-repeat;background-size:100% 10%;filter:blur(24px);transform:scale(1.2)} \ No newline at end of file