diff --git a/.github/workflows/ubuntu-6.2.yml b/.github/workflows/ubuntu-6.2.yml index 47667e0d..b67860a9 100644 --- a/.github/workflows/ubuntu-6.2.yml +++ b/.github/workflows/ubuntu-6.2.yml @@ -123,7 +123,8 @@ jobs: echo "release_time=$(date +'%H%M%S')" >> $GITHUB_OUTPUT echo "release_time_clock=$(date +'%H:%M:%S')" >> $GITHUB_OUTPUT echo "release_hm=$(date +'%y%m%d')" >> $GITHUB_OUTPUT - echo "appname=$(ls *.AppImage*)" >> $GITHUB_OUTPUT + appname=$(ls *.AppImage* -1|head -n1) + echo "appname=$appname" >> $GITHUB_OUTPUT - name: "Build Changelog" id: build_changelog diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index c092ebbe..1ae53c51 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -111,7 +111,8 @@ jobs: echo "release_time=$(date +'%H%M%S')" >> $GITHUB_OUTPUT echo "release_time_clock=$(date +'%H:%M:%S')" >> $GITHUB_OUTPUT echo "release_hm=$(date +'%y%m%d')" >> $GITHUB_OUTPUT - echo "appname=$(ls *.AppImage*)" >> $GITHUB_OUTPUT + appname=$(ls *.AppImage* -1|head -n1) + echo "appname=$appname" >> $GITHUB_OUTPUT - name: "Build Changelog" id: build_changelog diff --git a/.github/workflows/windows-6.x.yml b/.github/workflows/windows-6.x.yml index 29ecf54c..55d5729d 100644 --- a/.github/workflows/windows-6.x.yml +++ b/.github/workflows/windows-6.x.yml @@ -170,10 +170,11 @@ jobs: - name: package id: package - env: - archiveName: GoldenDict-Windows.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }} + shell: bash run: | - echo "packageName=${env:archiveName}" >> $GITHUB_OUTPUT + packageName=GoldenDict-Windows.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }} + echo $packageName + echo "packageName=$packageName" >> $GITHUB_OUTPUT - name: upload goldendict.exe only uses: svenstaro/upload-release-action@v2 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0a28f96c..378516ce 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -105,16 +105,21 @@ jobs: echo QTDIR=%Qt5_DIR% >> %GITHUB_ENV% # 打包 - - name: package - id: package + - name: windows ps package + id: package-windows env: archiveName: GoldenDict-Windows.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }} - msvcArch: ${{ matrix.msvc_arch }} shell: pwsh run: | & .github\scripts\windows-publish.ps1 ${env:archiveName} ${env:targetName} - $name = ${env:archiveName} - echo "packageName=$name" >> $GITHUB_OUTPUT + + - name: package + id: package + shell: bash + run: | + packageName=GoldenDict-Windows.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }} + echo $packageName + echo "packageName=$packageName" >> $GITHUB_OUTPUT - name: "Build Changelog" id: build_changelog