Merge pull request #26 from auyer/bump-depencies_and_prepare_to_relea…

…se_from_main Bump depencies and prepare to release from Main instead of a release Branch
auyer · Jun 9, 2024 · 918a0ef · 918a0ef
2 parents 465b3e9 + b0bb4e5
commit 918a0ef
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 39 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -4,8 +4,6 @@ on:
   push:
     tags:
       - v*
-    branches:
-      - release/**
 
 jobs:
   release:
@@ -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

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libprotonup/Cargo.toml b/libprotonup/Cargo.toml
@@ -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"
@@ -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"] }
diff --git a/protonup-rs/Cargo.toml b/protonup-rs/Cargo.toml
@@ -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"
@@ -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"] }