v0.4.4 version fix (#11)

* fix version display + artifact name * fix ci
dadleyy · Feb 9, 2022 · d2ba010 · d2ba010
1 parent 69877f3
commit d2ba010
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 67 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -13,6 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: rust:1.58.1
+    env:
+      TWOWAIYO_VERSION: "${{ github.sha }}"
     steps:
       - uses: actions/checkout@v2
       - name: Update apt
@@ -53,14 +55,9 @@ jobs:
       - name: Populate distributable (boxbot)
         run: cp target/armv7-unknown-linux-gnueabihf/release/boxbot target/dist/twowaiyo/boxbot
       - name: Compress distributable
-        run: tar cvzf ./twowaiyo-armv7-unknown-linux-gnueabihf.tar.gz -C target/dist twowaiyo
+        run: tar cvzf ./twowaiyo-armv7-unknown-linux-gnueabihf-$GITHUB_SHA.tar.gz -C target/dist twowaiyo
       - name: Create Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: ./twowaiyo-armv7-unknown-linux-gnueabihf.tar.gz
-################################################################
-# the following workflow have been deprecated:
-#  - https://github.com/actions/create-release
-#  - https://github.com/actions/upload-release-asset
-################################################################
+          files: "./twowaiyo-armv7-unknown-linux-gnueabihf-${{ github.sha }}.tar.gz"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/workspace/bankah/Cargo.toml b/workspace/bankah/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bankah"
-version = "0.4.3"
+version = "0.4.4"
 edition = "2018"
 
 [dependencies]

diff --git a/workspace/stickbot/Cargo.toml b/workspace/stickbot/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stickbot"
-version = "0.4.3"
+version = "0.4.4"
 edition = "2018"
 
 [lib]

diff --git a/workspace/stickbot/src/services.rs b/workspace/stickbot/src/services.rs
@@ -233,13 +233,13 @@ impl Services {
       db: mongo,
       rc: rc,
       redis: Arc::new(Mutex::new(redis)),
-      version: std::option_env!("STICKBOT_VERSION").unwrap_or("dev").to_string(),
+      version: std::option_env!("TWOWAIYO_VERSION").unwrap_or("dev").to_string(),
     })
   }
 }
 
 impl std::fmt::Display for Services {
   fn fmt(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
-    write!(formatter, "stickbot-services@v{}", self.version)
+    write!(formatter, "stickbot-services@{}", self.version)
   }
 }
diff --git a/workspace/twowaiyo/Cargo.toml b/workspace/twowaiyo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "twowaiyo"
-version = "0.4.3"
+version = "0.4.4"
 edition = "2018"
 
 [lib]