Skip to content

Commit

Permalink
Merge pull request #3367 from golemfactory/kek/0.16.1-fixes
Browse files Browse the repository at this point in the history
v0.16.1 fixes
  • Loading branch information
kamirr authored Mar 3, 2025
2 parents 12d1939 + 60736e5 commit 172dabd
Show file tree
Hide file tree
Showing 7 changed files with 121 additions and 85 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/binaries-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on:
workflow_dispatch:
inputs:
profile:
description: 'Profile (unused right now)'
description: "Profile (unused right now)"
required: true
default: 'debug'
default: "debug"
push:
branches:
- master
- payments-dev
- release/*
- '**/all-tests'
- "**/all-tests"
pull_request:
branches:
- master
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
cp target/aarch64-unknown-linux-musl/release/{yagna,ya-provider,exe-unit,golemsp,gftp} build
- name: Upload binaries
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: Yagna linux-aarch64
path: build
169 changes: 103 additions & 66 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "yagna"
version = "0.16.0"
version = "0.16.1"
description = "Open platform and marketplace for distributed computations"
readme = "README.md"
authors = ["Golem Factory <[email protected]>"]
Expand Down Expand Up @@ -232,8 +232,8 @@ members = [
# diesel 1.4.* supports up to 0.23.0, but sqlx 0.5.9 requires 0.22.0
# sqlx 0.5.10 need 0.23.2, so 0.5.9 is last version possible
derive_more = "0.99.11"
erc20_payment_lib = { git = "https://github.com/golemfactory/erc20_payment_lib", rev = "4200567b931af64f4fb1f6b756dd6d051576b64f" }
erc20_processor = { git = "https://github.com/golemfactory/erc20_payment_lib", rev = "4200567b931af64f4fb1f6b756dd6d051576b64f" }
erc20_payment_lib = { git = "https://github.com/golemfactory/erc20_payment_lib", rev = "79955d735f64467b01f04abfc70da39e4ba4be3c" }
erc20_processor = { git = "https://github.com/golemfactory/erc20_payment_lib", rev = "79955d735f64467b01f04abfc70da39e4ba4be3c" }
#erc20_payment_lib = { path = "../../payments/erc20_payment_lib/crates/erc20_payment_lib" }
#erc20_processor = { path = "../../payments/erc20_payment_lib" }
#erc20_payment_lib = { version = "=0.4.1" }
Expand All @@ -246,9 +246,9 @@ strum = { version = "0.24", features = ["derive"] }
trust-dns-resolver = "0.22"
url = "2.3.1"
ya-agreement-utils = { version = "0.6", path = "utils/agreement-utils" }
ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "7d6bd1c0354223b1a3efceff281120956ca61486" }
ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "f727dfc735f051c07346f9a925375381bb72fad9" }
#ya-relay-client = { path = "../ya-relay/client" }
ya-relay-stack = { git = "https://github.com/golemfactory/ya-relay.git", rev = "c92a75b0cf062fcc9dbb3ea2a034d913e5fad8e5" }
ya-relay-stack = { git = "https://github.com/golemfactory/ya-relay.git", rev = "f727dfc735f051c07346f9a925375381bb72fad9" }
ya-service-bus = { version = "0.7.1" }
parking_lot = "0.12.3"
mime = "0.3.17"
Expand Down
2 changes: 1 addition & 1 deletion core/vpn/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mime.workspace = true
rand = "0.7.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
smoltcp = { package = "ya-smoltcp", version = "0.1" }
smoltcp = "0.10.0"
thiserror = "1.0"
tokio = { version = "1", features = ["time"] }
tokio-stream = "0.1.6"
Expand Down
Loading

0 comments on commit 172dabd

Please sign in to comment.