diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 37ddea68..a53e86b0 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -62,7 +62,7 @@ jobs: workflow: CI.yml name: apk - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 if: startsWith(github.ref, 'refs/tags/') with: generate_release_notes: true diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 580d4a9f..72122089 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -39,5 +39,5 @@ jobs: steps: - uses: fastify/github-action-merge-dependabot@v3 with: - target: minor + # target: minor github-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/Cargo.lock b/Cargo.lock index 5b72a3e6..7e06146b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1652,9 +1652,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -2067,16 +2067,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] diff --git a/README.md b/README.md index 0f9ee1da..75cbf5bc 100644 --- a/README.md +++ b/README.md @@ -11,3 +11,14 @@ πŸ‘‰Π‘ΠΎΡ‚ Π±ΡƒΠ΄Π΅ Π΄ΠΎΠΏΠΎΠ²Π½ΡŽΠ²Π°Ρ‚ΠΈΡΡŒ Π·Π° появи Π½ΠΎΠ²ΠΈΡ… Π·Π°ΠΏΠΈΡ‚Ρ–Π². πŸ™Π”ΠΎΠΏΠΎΠΌΠΎΠΆΡ–Ρ‚ΡŒ ΠΏΠΎΡˆΠΈΡ€ΠΈΡ‚ΠΈ Π±ΠΎΡ‚Π° - Ρ†Π΅ ΠΌΠΎΠΆΠ΅ врятувати ΠΆΠΈΡ‚Ρ‚ΡπŸ™ + +# Architecture +- `core` (Rust) - data loading, state management +- `bot` (Rust) - telegram bot. Messaging, commands, broadcasting +- `app` (Flutter) - flutter app. Uses `core` for content management + +# Git workflow +- `main` - production-ready code, only pull requests. After CI passes, merged +commits are deployed to production +- `dev` - development branch. All feature branches are merged here. After CI passes, +merged commits are deployed to staging