Skip to content

Commit

Permalink
Merge branch 'main' into update-cargo-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@nanu-c
nanu-c authored Aug 6, 2024
2 parents 8ff9c93 + 837e74c commit 9e38dbd
Show file tree
Hide file tree
Showing 5 changed files with 161 additions and 141 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/build.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,11 @@ jobs:
- name: Install dependencies
run: yarn --cwd ./axolotl-web install --frozen-lockfile

- name: Install tauri-cli
run: cargo install tauri-cli --version "^2.0.0-rc"
- name: Install and cache tauri-cli
uses: baptiste0928/cargo-install@v3
with:
crate: tauri-cli
version: '^2.0.0-rc'

- name: Build deb package
run: cargo tauri build --ci --features tauri --bundles deb
Expand Down Expand Up @@ -235,8 +238,11 @@ jobs:
- name: Install dependencies
run: yarn --cwd ./axolotl-web install --frozen-lockfile

- name: Install tauri-cli
run: cargo install tauri-cli --version "^2.0.0-rc"
- name: Install and cache tauri-cli
uses: baptiste0928/cargo-install@v3
with:
crate: tauri-cli
version: '^2.0.0-rc'

- name: Build deb package
run: cargo tauri build --ci --target aarch64-unknown-linux-gnu --features tauri --bundles deb
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/pull_request.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,17 @@ concurrency:
jobs:
build:
uses: ./.github/workflows/build.yaml

# Check if all important jobs passed
# This can be used as required status for branch protection rules.
pr-ok:
runs-on: ubuntu-latest
needs: build
if: always()
steps:
- name: All tests ok
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Some tests failed
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1
8 changes: 4 additions & 4 deletions axolotl-web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"@jmd01/mic-recorder-to-mp3": "^2.2.3",
"@popperjs/core": "^2.11.8",
"bootstrap": "^5.3.3",
"core-js": "^3.37.1",
"core-js": "^3.38.0",
"file-saver": "^2.0.5",
"linkify-html": "^4.1.3",
"linkifyjs": "^4.1.3",
"moment": "^2.30.1",
"qrcode": "1.5.3",
"vue": "^3.4.34",
"vue": "^3.4.35",
"vue-native-websocket-vue3": "^3.1.7",
"vue-router": "^4.4.2",
"vue3-gettext": "^3.0.0-beta.5",
Expand All @@ -44,11 +44,11 @@
},
"devDependencies": {
"@eslint/compat": "^1.1.1",
"@vitejs/plugin-vue": "^5.1.1",
"@vitejs/plugin-vue": "^5.1.2",
"@vue/compiler-sfc": "^3.4.34",
"@vue/eslint-config-airbnb": "^8.0.0",
"@vue/test-utils": "^2.4.6",
"browserslist": "^4.23.2",
"browserslist": "^4.23.3",
"chai": "^5.1.1",
"depcheck": "^1.4.7",
"eslint": "^9.8.0",
Expand Down
176 changes: 88 additions & 88 deletions axolotl-web/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,10 +501,10 @@
resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==

"@vitejs/plugin-vue@^5.1.1":
version "5.1.1"
resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.1.1.tgz#bb9ddb0af012450edef4f5d65d5b3a3c7630864f"
integrity sha512-sDckXxlHpMsjRQbAH9WanangrfrblsOd3pNifePs+FOHjJg1jfWq5L/P0PsBRndEt3nmdUnmvieP8ULDeX5AvA==
"@vitejs/plugin-vue@^5.1.2":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.1.2.tgz#f11091e0130eca6c1ca8cfb85ee71ea53b255d31"
integrity sha512-nY9IwH12qeiJqumTCLJLE7IiNx7HZ39cbHaysEUd+Myvbz9KAqd2yq+U01Kab1R/H1BmiyM2ShTYlNH32Fzo3A==

"@vitest/[email protected]":
version "2.0.5"
Expand Down Expand Up @@ -557,47 +557,47 @@
loupe "^3.1.1"
tinyrainbow "^1.2.0"

"@vue/[email protected].34":
version "3.4.34"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.34.tgz#4e6af7a00927284f1f67571e2e1a8a6e93ee2d1f"
integrity sha512-Z0izUf32+wAnQewjHu+pQf1yw00EGOmevl1kE+ljjjMe7oEfpQ+BI3/JNK7yMB4IrUsqLDmPecUrpj3mCP+yJQ==
"@vue/[email protected].35":
version "3.4.35"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.35.tgz#421922a75ecabf1aabc6b7a2ce98b5acb2fc2d65"
integrity sha512-gKp0zGoLnMYtw4uS/SJRRO7rsVggLjvot3mcctlMXunYNsX+aRJDqqw/lV5/gHK91nvaAAlWFgdVl020AW1Prg==
dependencies:
"@babel/parser" "^7.24.7"
"@vue/shared" "3.4.34"
"@vue/shared" "3.4.35"
entities "^4.5.0"
estree-walker "^2.0.2"
source-map-js "^1.2.0"

"@vue/[email protected].34":
version "3.4.34"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.34.tgz#fd3b8df142b063c2cc0ec3e168b76b0d7774b78c"
integrity sha512-3PUOTS1h5cskdOJMExCu2TInXuM0j60DRPpSCJDqOCupCfUZCJoyQmKtRmA8EgDNZ5kcEE7vketamRZfrEuVDw==
"@vue/[email protected].35":
version "3.4.35"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.35.tgz#cd0881f1b4ed655cd96367bce4845f87023a5a2d"
integrity sha512-pWIZRL76/oE/VMhdv/ovZfmuooEni6JPG1BFe7oLk5DZRo/ImydXijoZl/4kh2406boRQ7lxTYzbZEEXEhj9NQ==
dependencies:
"@vue/compiler-core" "3.4.34"
"@vue/shared" "3.4.34"
"@vue/compiler-core" "3.4.35"
"@vue/shared" "3.4.35"

"@vue/[email protected].34", "@vue/compiler-sfc@^3.3.4", "@vue/compiler-sfc@^3.4.34":
version "3.4.34"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.34.tgz#9a892747f8f707183a592f2dbd359b0272749dc1"
integrity sha512-x6lm0UrM03jjDXTPZgD9Ad8bIVD1ifWNit2EaWQIZB5CULr46+FbLQ5RpK7AXtDHGjx9rmvC7QRCTjsiGkAwRw==
"@vue/[email protected].35", "@vue/compiler-sfc@^3.3.4", "@vue/compiler-sfc@^3.4.34":
version "3.4.35"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.35.tgz#16f87dd3bdab64cef14d3a6fcf53f8673e404071"
integrity sha512-xacnRS/h/FCsjsMfxBkzjoNxyxEyKyZfBch/P4vkLRvYJwe5ChXmZZrj8Dsed/752H2Q3JE8kYu9Uyha9J6PgA==
dependencies:
"@babel/parser" "^7.24.7"
"@vue/compiler-core" "3.4.34"
"@vue/compiler-dom" "3.4.34"
"@vue/compiler-ssr" "3.4.34"
"@vue/shared" "3.4.34"
"@vue/compiler-core" "3.4.35"
"@vue/compiler-dom" "3.4.35"
"@vue/compiler-ssr" "3.4.35"
"@vue/shared" "3.4.35"
estree-walker "^2.0.2"
magic-string "^0.30.10"
postcss "^8.4.39"
postcss "^8.4.40"
source-map-js "^1.2.0"

"@vue/[email protected].34":
version "3.4.34"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.4.34.tgz#4fac491550ddc2d8733ebb58a9c3bfbe85aa7bce"
integrity sha512-8TDBcLaTrFm5rnF+Qm4BlliaopJgqJ28Nsrc80qazynm5aJO+Emu7y0RWw34L8dNnTRdcVBpWzJxhGYzsoVu4g==
"@vue/[email protected].35":
version "3.4.35"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.4.35.tgz#0774c9a0afed74d71615209904b38f3fa9711adb"
integrity sha512-7iynB+0KB1AAJKk/biENTV5cRGHRdbdaD7Mx3nWcm1W8bVD6QmnH3B4AHhQQ1qZHhqFwzEzMwiytXm3PX1e60A==
dependencies:
"@vue/compiler-dom" "3.4.34"
"@vue/shared" "3.4.34"
"@vue/compiler-dom" "3.4.35"
"@vue/shared" "3.4.35"

"@vue/devtools-api@^6.0.0-beta.11", "@vue/devtools-api@^6.6.3":
version "6.6.3"
Expand All @@ -618,43 +618,43 @@
eslint-plugin-vuejs-accessibility "^2.0.0"
vue-eslint-parser "^9.3.2"

"@vue/[email protected].34":
version "3.4.34"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.34.tgz#388ec52f55a3fbe6f9332d5d993567a1886fdc76"
integrity sha512-ua+Lo+wBRlBEX9TtgPOShE2JwIO7p6BTZ7t1KZVPoaBRfqbC7N3c8Mpzicx173fXxx5VXeU6ykiHo7WgLzJQDA==
"@vue/[email protected].35":
version "3.4.35"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.35.tgz#dfbb4f5371da1290ac86e3313d0e9a68bb0ab38d"
integrity sha512-Ggtz7ZZHakriKioveJtPlStYardwQH6VCs9V13/4qjHSQb/teE30LVJNrbBVs4+aoYGtTQKJbTe4CWGxVZrvEw==
dependencies:
"@vue/shared" "3.4.34"
"@vue/shared" "3.4.35"

"@vue/[email protected].34":
version "3.4.34"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.34.tgz#47d2ab89c796d7012be17e2bbec40cff001317d7"
integrity sha512-PXhkiRPwcPGJ1BnyBZFI96GfInCVskd0HPNIAZn7i3YOmLbtbTZpB7/kDTwC1W7IqdGPkTVC63IS7J2nZs4Ebg==
"@vue/[email protected].35":
version "3.4.35"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.35.tgz#c036013a7b1bbe0d14a6b76eb4355dae6690d2e6"
integrity sha512-D+BAjFoWwT5wtITpSxwqfWZiBClhBbR+bm0VQlWYFOadUUXFo+5wbe9ErXhLvwguPiLZdEF13QAWi2vP3ZD5tA==
dependencies:
"@vue/reactivity" "3.4.34"
"@vue/shared" "3.4.34"
"@vue/reactivity" "3.4.35"
"@vue/shared" "3.4.35"

"@vue/[email protected].34":
version "3.4.34"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.34.tgz#8a7f25647c3ac8d9fc2208fd5e06f70ba2dd6638"
integrity sha512-dXqIe+RqFAK2Euak4UsvbIupalrhc67OuQKpD7HJ3W2fv8jlqvI7szfBCsAEcE8o/wyNpkloxB6J8viuF/E3gw==
"@vue/[email protected].35":
version "3.4.35"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.35.tgz#74254c7c327163d692e1d7d2b6d9e92463744e90"
integrity sha512-yGOlbos+MVhlS5NWBF2HDNgblG8e2MY3+GigHEyR/dREAluvI5tuUUgie3/9XeqhPE4LF0i2wjlduh5thnfOqw==
dependencies:
"@vue/reactivity" "3.4.34"
"@vue/runtime-core" "3.4.34"
"@vue/shared" "3.4.34"
"@vue/reactivity" "3.4.35"
"@vue/runtime-core" "3.4.35"
"@vue/shared" "3.4.35"
csstype "^3.1.3"

"@vue/[email protected].34":
version "3.4.34"
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.34.tgz#4b3a5bc6fb818aef9713e41fb78dece256dd933c"
integrity sha512-GeyEUfMVRZMD/mZcNONEqg7MiU10QQ1DB3O/Qr6+8uXpbwdlmVgQ5Qs1/ZUAFX1X2UUtqMoGrDRbxdWfOJFT7Q==
"@vue/[email protected].35":
version "3.4.35"
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.35.tgz#188e94e82d8e729ba7b40dd91d10678b85f77c6b"
integrity sha512-iZ0e/u9mRE4T8tNhlo0tbA+gzVkgv8r5BX6s1kRbOZqfpq14qoIvCZ5gIgraOmYkMYrSEZgkkojFPr+Nyq/Mnw==
dependencies:
"@vue/compiler-ssr" "3.4.34"
"@vue/shared" "3.4.34"
"@vue/compiler-ssr" "3.4.35"
"@vue/shared" "3.4.35"

"@vue/[email protected].34":
version "3.4.34"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.34.tgz#130858419e634a427ca82c36e1da75c66a39ba8e"
integrity sha512-x5LmiRLpRsd9KTjAB8MPKf0CDPMcuItjP0gbNqFCIgL1I8iYp4zglhj9w9FPCdIbHG2M91RVeIbArFfFTz9I3A==
"@vue/[email protected].35":
version "3.4.35"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.35.tgz#5432f4b1c79e763fcf78cc830faf59ff01248968"
integrity sha512-hvuhBYYDe+b1G8KHxsQ0diDqDMA8D9laxWZhNAjE83VZb5UDaXl9Xnz7cGdDSyiHM90qqI/CyGMcpBpiDy6VVQ==

"@vue/test-utils@^2.4.6":
version "2.4.6"
Expand Down Expand Up @@ -944,14 +944,14 @@ braces@^3.0.3, braces@~3.0.2:
dependencies:
fill-range "^7.1.1"

browserslist@^4.23.2:
version "4.23.2"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.2.tgz#244fe803641f1c19c28c48c4b6ec9736eb3d32ed"
integrity sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==
browserslist@^4.23.3:
version "4.23.3"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
dependencies:
caniuse-lite "^1.0.30001640"
electron-to-chromium "^1.4.820"
node-releases "^2.0.14"
caniuse-lite "^1.0.30001646"
electron-to-chromium "^1.5.4"
node-releases "^2.0.18"
update-browserslist-db "^1.1.0"

cac@^6.7.14:
Expand Down Expand Up @@ -990,10 +990,10 @@ camelcase@^6.3.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==

caniuse-lite@^1.0.30001640:
version "1.0.30001643"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz#9c004caef315de9452ab970c3da71085f8241dbd"
integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==
caniuse-lite@^1.0.30001646:
version "1.0.30001649"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001649.tgz#3ec700309ca0da2b0d3d5fb03c411b191761c992"
integrity sha512-fJegqZZ0ZX8HOWr6rcafGr72+xcgJKI9oWfDW5DrD7ExUtgZC7a7R7ZYmZqplh7XDocFdGeIFn7roAxhOeYrPQ==

chai@^5.1.1:
version "5.1.1"
Expand Down Expand Up @@ -1125,10 +1125,10 @@ confusing-browser-globals@^1.0.10:
resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==

core-js@^3.37.1, core-js@^3.6.5:
version "3.37.1"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.1.tgz#d21751ddb756518ac5a00e4d66499df981a62db9"
integrity sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==
core-js@^3.38.0, core-js@^3.6.5:
version "3.38.0"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.38.0.tgz#8acb7c050bf2ccbb35f938c0d040132f6110f636"
integrity sha512-XPpwqEodRljce9KswjZShh95qJ1URisBeKCjUdq27YdenkslVe7OO0ZJhlYXAChW7OhXaRLl8AAba7IBfoIHug==

cosmiconfig@^7.1.0:
version "7.1.0"
Expand Down Expand Up @@ -1374,10 +1374,10 @@ editorconfig@^1.0.4:
minimatch "9.0.1"
semver "^7.5.3"

electron-to-chromium@^1.4.820:
version "1.5.2"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz#6126ad229ce45e781ec54ca40db0504787f23d19"
integrity sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ==
electron-to-chromium@^1.5.4:
version "1.5.4"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz#cd477c830dd6fca41fbd5465c1ff6ce08ac22343"
integrity sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==

emoji-regex@^10.0.0:
version "10.3.0"
Expand Down Expand Up @@ -2889,7 +2889,7 @@ natural-compare@^1.4.0:
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==

node-releases@^2.0.14:
node-releases@^2.0.18:
version "2.0.18"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
Expand Down Expand Up @@ -3193,7 +3193,7 @@ postcss-selector-parser@^6.0.15:
cssesc "^3.0.0"
util-deprecate "^1.0.2"

postcss@^8.4.39:
postcss@^8.4.39, postcss@^8.4.40:
version "8.4.40"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.40.tgz#eb81f2a4dd7668ed869a6db25999e02e9ad909d8"
integrity sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==
Expand Down Expand Up @@ -4016,16 +4016,16 @@ vue3-tel-input@^1.0.4:
user "^0.0.0"
vue "^3.0.0-beta.1"

vue@^3.0.0-beta.1, vue@^3.4.34:
version "3.4.34"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.34.tgz#19d9a82854d54c4506d1e2854c9c038ee430484a"
integrity sha512-VZze05HWlA3ItreQ/ka7Sx7PoD0/3St8FEiSlSTVgb6l4hL+RjtP2/8g5WQBzZgyf8WG2f+g1bXzC7zggLhAJA==
vue@^3.0.0-beta.1, vue@^3.4.35:
version "3.4.35"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.35.tgz#9ad23525919eece40153fdf8675d07ddd879eb33"
integrity sha512-+fl/GLmI4GPileHftVlCdB7fUL4aziPcqTudpTGXCT8s+iZWuOCeNEB5haX6Uz2IpRrbEXOgIFbe+XciCuGbNQ==
dependencies:
"@vue/compiler-dom" "3.4.34"
"@vue/compiler-sfc" "3.4.34"
"@vue/runtime-dom" "3.4.34"
"@vue/server-renderer" "3.4.34"
"@vue/shared" "3.4.34"
"@vue/compiler-dom" "3.4.35"
"@vue/compiler-sfc" "3.4.35"
"@vue/runtime-dom" "3.4.35"
"@vue/server-renderer" "3.4.35"
"@vue/shared" "3.4.35"

vuex@^4.1.0:
version "4.1.0"
Expand Down
Loading

0 comments on commit 9e38dbd

Please sign in to comment.