Compare commits
6 Commits
9072e253ec
...
v0.1.22
Author | SHA1 | Date | |
---|---|---|---|
bb55b46c34 | |||
76d54cb433 | |||
4dc8c56a5c | |||
c81040b16b | |||
68c307e258 | |||
5d00f072d8 |
@@ -149,7 +149,7 @@ jobs:
|
|||||||
path: |
|
path: |
|
||||||
${{ needs.detect-project.outputs.project-dir }}/target/${{ matrix.target }}/release/${{ needs.detect-project.outputs.project-name }}${{ matrix.os == 'windows' && '.exe' || '' }}
|
${{ needs.detect-project.outputs.project-dir }}/target/${{ matrix.target }}/release/${{ needs.detect-project.outputs.project-name }}${{ matrix.os == 'windows' && '.exe' || '' }}
|
||||||
|
|
||||||
set-tag:
|
set-tag:
|
||||||
name: Set Tag Name
|
name: Set Tag Name
|
||||||
needs: [detect-project, build]
|
needs: [detect-project, build]
|
||||||
#if: ${{ !failure() && !cancelled() && github.event_name != 'pull_request' }}
|
#if: ${{ !failure() && !cancelled() && github.event_name != 'pull_request' }}
|
||||||
@@ -260,6 +260,7 @@ set-tag:
|
|||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
run: |
|
run: |
|
||||||
|
echo "Creating new tag: ${{ needs.set-tag.outputs.tag_name }}"
|
||||||
git tag ${{ needs.set-tag.outputs.tag_name }}
|
git tag ${{ needs.set-tag.outputs.tag_name }}
|
||||||
git push origin ${{ needs.set-tag.outputs.tag_name }}
|
git push origin ${{ needs.set-tag.outputs.tag_name }}
|
||||||
|
|
@@ -55,7 +55,7 @@ impl DockerManager {
|
|||||||
|
|
||||||
Ok(containers
|
Ok(containers
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.find(|c| c.image == client_image)
|
.find(|c| c.image.contains(client_image))
|
||||||
.map(|container| DockerContainerDto {
|
.map(|container| DockerContainerDto {
|
||||||
id: container.id,
|
id: container.id,
|
||||||
image: container.image,
|
image: container.image,
|
||||||
@@ -66,13 +66,13 @@ impl DockerManager {
|
|||||||
/// Gets the current client version (image name) if running in Docker
|
/// Gets the current client version (image name) if running in Docker
|
||||||
pub async fn get_client_version(&self) -> String {
|
pub async fn get_client_version(&self) -> String {
|
||||||
match self.get_client_container().await {
|
match self.get_client_container().await {
|
||||||
Ok(Some(container)) => container.image,
|
Ok(Some(container)) => container.image.split(':').next().unwrap_or("unknown").to_string(),
|
||||||
Ok(None) => {
|
Ok(None) => {
|
||||||
eprintln!("Warning: No WatcherAgent container found");
|
println!("Warning: No WatcherAgent container found");
|
||||||
"unknown".to_string()
|
"unknown".to_string()
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("Warning: Could not get current image version: {}", e);
|
println!("Warning: Could not get current image version: {}", e);
|
||||||
"unknown".to_string()
|
"unknown".to_string()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user