Compare commits
8 Commits
c7b8e24a54
...
v0.1.21
Author | SHA1 | Date | |
---|---|---|---|
76d54cb433 | |||
4dc8c56a5c | |||
c81040b16b | |||
68c307e258 | |||
5d00f072d8 | |||
9072e253ec | |||
063ad113d7 | |||
097be0f555 |
@@ -3,7 +3,7 @@ name: Rust Cross-Platform Build
|
|||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
push:
|
push:
|
||||||
branches: [ "development", "main", "feature/*", "bugfix/*", "enhancement/*" ]
|
branches: [ "development", "main", "staging" ]
|
||||||
tags: [ "v*.*.*" ]
|
tags: [ "v*.*.*" ]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
@@ -199,13 +199,6 @@ set-tag:
|
|||||||
echo "tag_name=${new_tag}" >> $GITHUB_OUTPUT
|
echo "tag_name=${new_tag}" >> $GITHUB_OUTPUT
|
||||||
echo "should_tag=true" >> $GITHUB_OUTPUT
|
echo "should_tag=true" >> $GITHUB_OUTPUT
|
||||||
echo "Creating new patch version tag: ${new_tag}"
|
echo "Creating new patch version tag: ${new_tag}"
|
||||||
|
|
||||||
else
|
|
||||||
echo "Not on main, development, or staging branch."
|
|
||||||
echo "Branch: ${GITHUB_REF}"
|
|
||||||
echo "Skipping tag creation and Docker build."
|
|
||||||
echo "should_tag=false" >> $GITHUB_OUTPUT
|
|
||||||
# Don't set tag_name output for non-release branches
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
docker-build:
|
docker-build:
|
||||||
@@ -267,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,
|
||||||
@@ -68,11 +68,11 @@ impl DockerManager {
|
|||||||
match self.get_client_container().await {
|
match self.get_client_container().await {
|
||||||
Ok(Some(container)) => container.image,
|
Ok(Some(container)) => container.image,
|
||||||
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