Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ci #59

Merged
merged 16 commits into from
Sep 29, 2024
Merged

Ci #59

merged 16 commits into from
Sep 29, 2024

Conversation

ilyagr
Copy link
Owner

@ilyagr ilyagr commented Sep 29, 2024

No description provided.

@ilyagr ilyagr force-pushed the ci branch 4 times, most recently from 54fbfb2 to 4c4ffda Compare September 29, 2024 03:07
ilyagr and others added 13 commits September 28, 2024 20:14
@ilyagr
README: Mention mergetool usage
a49ecfc
@dependabot @ilyagr
github: bump the github-dependencies group across 1 directory with 2 …
25ff791 
…updates

Bumps the github-dependencies group with 2 updates in the / directory: [shogo82148/actions-upload-release-asset](https://github.com/shogo82148/actions-upload-release-asset) and [tauri-apps/tauri-action](https://github.com/tauri-apps/tauri-action).


Updates `shogo82148/actions-upload-release-asset` from 1.7.5 to 1.7.7
- [Release notes](https://github.com/shogo82148/actions-upload-release-asset/releases)
- [Commits](shogo82148/actions-upload-release-asset@8f032ef...aac270e)

Updates `tauri-apps/tauri-action` from 0.5.6 to 0.5.14
- [Release notes](https://github.com/tauri-apps/tauri-action/releases)
- [Changelog](https://github.com/tauri-apps/tauri-action/blob/dev/CHANGELOG.md)
- [Commits](tauri-apps/tauri-action@v0.5.6...v0.5.14)

---
updated-dependencies:
- dependency-name: shogo82148/actions-upload-release-asset
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-dependencies
- dependency-name: tauri-apps/tauri-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @ilyagr
dependabot npm-dependencies && npm update && npm ci && npm run build
b25dbee 
## dependabot description

npm: bump the npm-dependencies group across 1 directory with 7 updates

Bumps the npm-dependencies group with 7 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [codemirror](https://github.com/codemirror/basic-setup) | `5.65.16` | `5.65.18` |
| [lit-html](https://github.com/lit/lit/tree/HEAD/packages/lit-html) | `3.1.4` | `3.2.0` |
| [@tauri-apps/cli](https://github.com/tauri-apps/tauri) | `1.6.0` | `1.6.2` |
| [prettier](https://github.com/prettier/prettier) | `3.3.2` | `3.3.3` |
| [typescript](https://github.com/microsoft/TypeScript) | `5.5.3` | `5.6.2` |
| [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) | `5.3.6` | `5.4.8` |
| [vite-plugin-checker](https://github.com/fi3ework/vite-plugin-checker) | `0.7.1` | `0.8.0` |



Updates `codemirror` from 5.65.16 to 5.65.18
- [Changelog](https://github.com/codemirror/basic-setup/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/basic-setup/commits)

Updates `lit-html` from 3.1.4 to 3.2.0
- [Release notes](https://github.com/lit/lit/releases)
- [Changelog](https://github.com/lit/lit/blob/main/packages/lit-html/CHANGELOG.md)
- [Commits](https://github.com/lit/lit/commits/lit-html@3.2.0/packages/lit-html)

Updates `@tauri-apps/cli` from 1.6.0 to 1.6.2
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/cli-v1.6.0...@tauri-apps/cli-v1.6.2)

Updates `prettier` from 3.3.2 to 3.3.3
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.3.2...3.3.3)

Updates `typescript` from 5.5.3 to 5.6.2
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](microsoft/TypeScript@v5.5.3...v5.6.2)

Updates `vite` from 5.3.6 to 5.4.8
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.8/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.8/packages/vite)

Updates `vite-plugin-checker` from 0.7.1 to 0.8.0
- [Release notes](https://github.com/fi3ework/vite-plugin-checker/releases)
- [Changelog](https://github.com/fi3ework/vite-plugin-checker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fi3ework/vite-plugin-checker/compare/vite-plugin-checker@0.7.1...vite-plugin-checker@0.8.0)

---
updated-dependencies:
- dependency-name: codemirror
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: npm-dependencies
- dependency-name: lit-html
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
- dependency-name: "@tauri-apps/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-dependencies
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-dependencies
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
- dependency-name: vite
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
- dependency-name: vite-plugin-checker
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @ilyagr
dependabot cargo && cargo update, use tauri 1.8
9f87d26 
## Dependabot changelog

cargo: bump the cargo-dependencies group across 1 directory with 14 updates

Bumps the cargo-dependencies group with 13 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [clap](https://github.com/clap-rs/clap) | `4.5.9` | `4.5.18` |
| [indexmap](https://github.com/indexmap-rs/indexmap) | `2.2.6` | `2.5.0` |
| [open](https://github.com/Byron/open-rs) | `5.2.0` | `5.3.0` |
| [poem](https://github.com/poem-web/poem) | `3.0.1` | `3.1.0` |
| [rust-embed](https://github.com/pyros2097/rust-embed) | `8.4.0` | `8.5.0` |
| [serde](https://github.com/serde-rs/serde) | `1.0.204` | `1.0.210` |
| [thiserror](https://github.com/dtolnay/thiserror) | `1.0.61` | `1.0.64` |
| [toml](https://github.com/toml-rs/toml) | `0.8.14` | `0.8.15` |
| [insta](https://github.com/mitsuhiko/insta) | `1.39.0` | `1.40.0` |
| [tempfile](https://github.com/Stebalien/tempfile) | `3.10.1` | `3.11.0` |
| [tauri](https://github.com/tauri-apps/tauri) | `1.6.8` | `1.7.1` |
| [serde_json](https://github.com/serde-rs/json) | `1.0.120` | `1.0.128` |
| [tauri-build](https://github.com/tauri-apps/tauri) | `1.5.3` | `1.5.5` |



Updates `clap` from 4.5.9 to 4.5.18
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](clap-rs/clap@clap_complete-v4.5.9...clap_complete-v4.5.18)

Updates `indexmap` from 2.2.6 to 2.5.0
- [Changelog](https://github.com/indexmap-rs/indexmap/blob/master/RELEASES.md)
- [Commits](indexmap-rs/indexmap@2.2.6...2.5.0)

Updates `open` from 5.2.0 to 5.3.0
- [Release notes](https://github.com/Byron/open-rs/releases)
- [Changelog](https://github.com/Byron/open-rs/blob/main/changelog.md)
- [Commits](Byron/open-rs@v5.2.0...v5.3.0)

Updates `poem` from 3.0.1 to 3.1.0
- [Release notes](https://github.com/poem-web/poem/releases)
- [Commits](https://github.com/poem-web/poem/commits)

Updates `rust-embed` from 8.4.0 to 8.5.0
- [Changelog](https://github.com/pyrossh/rust-embed/blob/master/changelog.md)
- [Commits](https://github.com/pyros2097/rust-embed/commits)

Updates `serde` from 1.0.204 to 1.0.210
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](serde-rs/serde@v1.0.204...v1.0.210)

Updates `thiserror` from 1.0.61 to 1.0.64
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](dtolnay/thiserror@1.0.61...1.0.64)

Updates `tokio` from 1.38.0 to 1.40.0
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](tokio-rs/tokio@tokio-1.38.0...tokio-1.40.0)

Updates `toml` from 0.8.14 to 0.8.15
- [Commits](toml-rs/toml@toml-v0.8.14...toml-v0.8.15)

Updates `insta` from 1.39.0 to 1.40.0
- [Release notes](https://github.com/mitsuhiko/insta/releases)
- [Changelog](https://github.com/mitsuhiko/insta/blob/master/CHANGELOG.md)
- [Commits](mitsuhiko/insta@1.39.0...1.40.0)

Updates `tempfile` from 3.10.1 to 3.11.0
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](Stebalien/tempfile@v3.10.1...v3.11.0)

Updates `tauri` from 1.6.8 to 1.7.1
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](tauri-apps/tauri@tauri-v1.6.8...tauri-v1.7.1)

Updates `serde_json` from 1.0.120 to 1.0.128
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](serde-rs/json@v1.0.120...1.0.128)

Updates `tauri-build` from 1.5.3 to 1.5.5
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](tauri-apps/tauri@tauri-build-v1.5.3...tauri-build-v1.5.5)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: cargo-dependencies
- dependency-name: indexmap
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cargo-dependencies
- dependency-name: open
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cargo-dependencies
- dependency-name: poem
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cargo-dependencies
- dependency-name: rust-embed
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cargo-dependencies
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: cargo-dependencies
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: cargo-dependencies
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cargo-dependencies
- dependency-name: toml
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: cargo-dependencies
- dependency-name: insta
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cargo-dependencies
- dependency-name: tempfile
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cargo-dependencies
- dependency-name: tauri
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: cargo-dependencies
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: cargo-dependencies
- dependency-name: tauri-build
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: cargo-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
@ilyagr
gitignore: ignore insta's .pending-snap files
d3926ed
@ilyagr
lib fs: allow editing single files in addition to dirs
c573f42
@ilyagr
webapp MergeState: store parent_window in MergeState
e90ddf9
@ilyagr
webapp: single-file mode (always pinned)
2eaaf86
@ilyagr
vite: build source maps
1b63b18
@ilyagr
local_server: use rust_embed::Embed from latest version of rust_embed
ef2b5fb
@ilyagr
local-server, rust-embed: exclude source map on release builds (TODO:…
16b9b70 
… is there a better way?)
@ilyagr
README: Updates to thoughts about 3-pane view
87a61ff
@ilyagr
v0.5.0
5bf5c6d
@ilyagr ilyagr merged commit 5bf5c6d into main Sep 29, 2024
23 checks passed
@ilyagr ilyagr deleted the ci branch September 29, 2024 03:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ilyagr