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

Bump depencies and prepare to release from Main instead of a release Branch #26

Merged
merged 3 commits into from
Jun 9, 2024
Merged

Bump depencies and prepare to release from Main instead of a release Branch #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dd2b69
deps: bump tokio to 1.38
auyer Jun 9, 2024
9fda354
ci: remove branch detection from release workflow
auyer Jun 9, 2024
b0bb4e5
chore: bump libprotonup and Protonup-rs to 0.8.2
auyer Jun 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 0 additions & 10 deletions .github/workflows/publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
push:
tags:
- v*
branches:
- release/**

jobs:
release:
Expand All @@ -15,19 +13,11 @@ jobs:
- uses: actions/checkout@master

- name: SET CURRENT_VERSION tag
if: startsWith(github.ref, 'refs/tags/v')
run: |
branchName=$(echo $GITHUB_REF | sed 's/refs\/tags\///' )
# variable CURRENT_VERSION should not have the "v" used in the branch name
echo "CURRENT_VERSION=$(echo $branchName | sed 's/v//' )" >> $GITHUB_ENV

- name: SET CURRENT_VERSION branch
if: startsWith(github.ref, 'refs/heads/')
run: |
branchName=$(echo $GITHUB_REF | sed 's/refs\/heads\/release\///')
# variable CURRENT_VERSION should not have the "v" used in the tag
echo "CURRENT_VERSION=$(echo $branchName | sed 's/v//' )" >> $GITHUB_ENV

- name: Update local toolchain
run: |
rustup update
Expand Down
46 changes: 23 additions & 23 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions libprotonup/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "libprotonup"
version = "0.8.1"
version = "0.8.2"
edition = "2021"
authors = ["Auyer <auyer@rcpassos.me>"]
repository = "https://github.com/auyer/protonup-rs"
Expand All @@ -27,10 +27,10 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
sha2 = "0.10"
structopt = "0.3"
tokio = { version = "1.37", features = ["macros"] }
tokio = { version = "1.38", features = ["macros"] }
tokio-stream = { version = "0.1", features = ["fs"] }
tokio-tar = "0.3"
tokio-util = "0.7"

[dev-dependencies]
tokio = { version = "1.37", features = ["macros", "rt"] }
tokio = { version = "1.38", features = ["macros", "rt"] }
6 changes: 3 additions & 3 deletions protonup-rs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "protonup-rs"
version = "0.8.1"
version = "0.8.2"
edition = "2021"
authors = ["Auyer <auyer@rcpassos.me>"]
repository = "https://github.com/auyer/protonup-rs"
Expand All @@ -26,13 +26,13 @@ assets = [
anyhow = "1.0"
arcstr = "1.2"
futures-util = "0.3"
libprotonup = { path = "../libprotonup", version = "0.8.1" }
libprotonup = { path = "../libprotonup", version = "0.8.2" }
inquire = { version = "0.7", default-features = false, features = ["termion"] }
indicatif = { version = "0.17", features = [
"improved_unicode",
"unicode-segmentation",
"tokio"
] }
tempfile = "3.10"
tokio = { version = "1.37", features = ["macros", "rt-multi-thread"] }
tokio = { version = "1.38", features = ["macros", "rt-multi-thread"] }
clap = { version = "4.5", features = ["derive"] }