mirror of
https://github.com/lennart-k/rustical.git
synced 2026-01-30 21:18:19 +00:00
Compare commits
2 Commits
d84158e8ad
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dde05d2f45 | ||
|
|
f503bf2bf7 |
8
.github/workflows/docker-publish.yml
vendored
8
.github/workflows/docker-publish.yml
vendored
@@ -2,7 +2,10 @@ name: Docker
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: ["main", "dev"]
|
branches:
|
||||||
|
- main
|
||||||
|
- dev
|
||||||
|
- feat/*
|
||||||
release:
|
release:
|
||||||
types: ["published"]
|
types: ["published"]
|
||||||
|
|
||||||
@@ -45,7 +48,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||||
tags: |
|
tags: |
|
||||||
type=ref,event=branch
|
${{ github.ref_name == 'main' && 'type=ref,event=branch' || '' }}
|
||||||
|
type=ref,event=branch,prefix=br-
|
||||||
type=ref,event=pr
|
type=ref,event=pr
|
||||||
type=semver,pattern={{version}}
|
type=semver,pattern={{version}}
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
type=semver,pattern={{major}}.{{minor}}
|
||||||
|
|||||||
4
Cargo.lock
generated
4
Cargo.lock
generated
@@ -2885,9 +2885,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quick-xml"
|
name = "quick-xml"
|
||||||
version = "0.38.4"
|
version = "0.39.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
|
checksum = "f2e3bf4aa9d243beeb01a7b3bc30b77cfe2c44e24ec02d751a7104a53c2c49a1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"memchr",
|
"memchr",
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ tokio = { version = "1.48", features = [
|
|||||||
url = "2.5"
|
url = "2.5"
|
||||||
base64 = "0.22"
|
base64 = "0.22"
|
||||||
thiserror = "2.0"
|
thiserror = "2.0"
|
||||||
quick-xml = { version = "0.38" }
|
quick-xml = { version = "0.39" }
|
||||||
rust-embed = "8.9"
|
rust-embed = "8.9"
|
||||||
tower-sessions = "0.14"
|
tower-sessions = "0.14"
|
||||||
futures-core = "0.3"
|
futures-core = "0.3"
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ impl<PN: XmlDeserialize> XmlDeserialize for PropElement<PN> {
|
|||||||
// start of a child element
|
// start of a child element
|
||||||
Event::Start(start) | Event::Empty(start) => {
|
Event::Start(start) | Event::Empty(start) => {
|
||||||
let empty = matches!(event, Event::Empty(_));
|
let empty = matches!(event, Event::Empty(_));
|
||||||
let (ns, name) = reader.resolve_element(start.name());
|
let (ns, name) = reader.resolver().resolve_element(start.name());
|
||||||
let ns = match ns {
|
let ns = match ns {
|
||||||
ResolveResult::Bound(ns) => Some(NamespaceOwned::from(ns)),
|
ResolveResult::Bound(ns) => Some(NamespaceOwned::from(ns)),
|
||||||
ResolveResult::Unknown(_ns) => todo!("handle error"),
|
ResolveResult::Unknown(_ns) => todo!("handle error"),
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ impl NamedStruct {
|
|||||||
#(#builder_field_inits),*
|
#(#builder_field_inits),*
|
||||||
};
|
};
|
||||||
|
|
||||||
let (ns, name) = reader.resolve_element(start.name());
|
let (ns, name) = reader.resolver().resolve_element(start.name());
|
||||||
#(#tagname_field_branches);*
|
#(#tagname_field_branches);*
|
||||||
#(#namespace_field_branches);*
|
#(#namespace_field_branches);*
|
||||||
|
|
||||||
@@ -161,7 +161,7 @@ impl NamedStruct {
|
|||||||
// start of a child element
|
// start of a child element
|
||||||
Event::Start(start) | Event::Empty(start) => {
|
Event::Start(start) | Event::Empty(start) => {
|
||||||
let empty = matches!(event, Event::Empty(_));
|
let empty = matches!(event, Event::Empty(_));
|
||||||
let (ns, name) = reader.resolve_element(start.name());
|
let (ns, name) = reader.resolver().resolve_element(start.name());
|
||||||
match (ns, name.as_ref()) {
|
match (ns, name.as_ref()) {
|
||||||
#(#named_field_branches),*
|
#(#named_field_branches),*
|
||||||
#(#untagged_field_branches),*
|
#(#untagged_field_branches),*
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ impl<T: XmlRootTag + XmlDeserialize> XmlDocument for T {
|
|||||||
match event {
|
match event {
|
||||||
Event::Decl(_) | Event::Comment(_) => { /* ignore this */ }
|
Event::Decl(_) | Event::Comment(_) => { /* ignore this */ }
|
||||||
Event::Start(start) | Event::Empty(start) => {
|
Event::Start(start) | Event::Empty(start) => {
|
||||||
let (ns, name) = reader.resolve_element(start.name());
|
let (ns, name) = reader.resolver().resolve_element(start.name());
|
||||||
let matches = match (Self::root_ns(), &ns, name) {
|
let matches = match (Self::root_ns(), &ns, name) {
|
||||||
// Wrong tag
|
// Wrong tag
|
||||||
(_, _, name) if name.as_ref() != Self::root_tag().as_bytes() => false,
|
(_, _, name) if name.as_ref() != Self::root_tag().as_bytes() => false,
|
||||||
|
|||||||
Reference in New Issue
Block a user