Skip to content

Commit d712aa9

Browse files
authored
使用していないimportの削除 (#185)
* Remove unused import * Fix tagName for pre-release
1 parent 0cdeb87 commit d712aa9

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.github/workflows/pre-release.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,26 @@ jobs:
7474
if [[ $TAG_NAME == *"alpha"* ]]; then
7575
echo "PRERELEASE_TYPE=Alpha" >> $GITHUB_ENV
7676
echo "PRERELEASE_EMOJI=🚧" >> $GITHUB_ENV
77+
echo "TAG_PREFIX=alpha" >> $GITHUB_ENV
7778
elif [[ $TAG_NAME == *"beta"* ]]; then
7879
echo "PRERELEASE_TYPE=Beta" >> $GITHUB_ENV
7980
echo "PRERELEASE_EMOJI=🧪" >> $GITHUB_ENV
81+
echo "TAG_PREFIX=beta" >> $GITHUB_ENV
8082
elif [[ $TAG_NAME == *"rc"* ]]; then
8183
echo "PRERELEASE_TYPE=Release Candidate" >> $GITHUB_ENV
8284
echo "PRERELEASE_EMOJI=🎯" >> $GITHUB_ENV
85+
echo "TAG_PREFIX=rc" >> $GITHUB_ENV
8386
else
8487
echo "PRERELEASE_TYPE=Pre-Release" >> $GITHUB_ENV
8588
echo "PRERELEASE_EMOJI=⚠️" >> $GITHUB_ENV
89+
echo "TAG_PREFIX=pre" >> $GITHUB_ENV
8690
fi
91+
92+
# Extract version number from tag (e.g., v1.0.0-alpha.1 -> 1.0.0 and 1)
93+
BASE_VERSION=$(echo $TAG_NAME | sed -E 's/v([0-9]+\.[0-9]+\.[0-9]+)-.*/\1/')
94+
PRERELEASE_NUMBER=$(echo $TAG_NAME | sed -E 's/.*\.(.*)/\1/')
95+
echo "BASE_VERSION=$BASE_VERSION" >> $GITHUB_ENV
96+
echo "PRERELEASE_NUMBER=$PRERELEASE_NUMBER" >> $GITHUB_ENV
8797
8898
- name: Build Tauri App
8999
uses: tauri-apps/tauri-action@v0
@@ -96,8 +106,8 @@ jobs:
96106
BUILD_TIMESTAMP: ${{ env.BUILD_TIMESTAMP }}
97107
with:
98108
projectPath: './app'
99-
tagName: v__VERSION__
100-
releaseName: '${{ env.PRERELEASE_EMOJI }} vmix-utility v__VERSION__ (${{ env.PRERELEASE_TYPE }})'
109+
tagName: ${{ env.TAG_PREFIX }}-v__VERSION__
110+
releaseName: '${{ env.PRERELEASE_EMOJI }} vmix-utility v${{ env.BASE_VERSION }} ${{ env.PRERELEASE_TYPE }} ${{ env.PRERELEASE_NUMBER }}'
101111
releaseBody: |
102112
## ${{ env.PRERELEASE_EMOJI }} Pre-Release: ${{ env.PRERELEASE_TYPE }}
103113

app/src-tauri/src/tcp_manager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::types::{VmixXml, VmixInput, VmixConnection, ConnectionType, VmixVideoListInput};
1+
use crate::types::{VmixXml, VmixInput, VmixConnection, ConnectionType};
22
use crate::state::AppState;
33
use crate::app_log;
44
use anyhow::Result;

0 commit comments

Comments
 (0)