hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3920 from Kingtous/master

Browse Source 
opt: simplify release names
This commit is contained in:
RustDesk 2023-04-04 20:49:29 +08:00 committed by GitHub
commit 6d4accf781
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
.github/workflows/flutter-build.yml vendored
View File

@ -34,7 +34,7 @@ jobs:
job: job:
# - { target: i686-pc-windows-msvc , os: windows-2019 } # - { target: i686-pc-windows-msvc , os: windows-2019 }
# - { target: x86_64-pc-windows-gnu , os: windows-2019 } # - { target: x86_64-pc-windows-gnu , os: windows-2019 }
- { target: x86_64-pc-windows-msvc, os: windows-2019 } - { target: x86_64-pc-windows-msvc, os: windows-2019, arch: x86_64 }
# - { target: aarch64-pc-windows-msvc, os: windows-2019, arch: aarch64 } # - { target: aarch64-pc-windows-msvc, os: windows-2019, arch: aarch64 }
steps: steps:
- name: Checkout source code - name: Checkout source code
@ -107,14 +107,7 @@ jobs:
python3 ./generate.py -f ../../flutter/build/windows/runner/Release/ -o . -e ../../flutter/build/windows/runner/Release/rustdesk.exe python3 ./generate.py -f ../../flutter/build/windows/runner/Release/ -o . -e ../../flutter/build/windows/runner/Release/rustdesk.exe
popd popd
mkdir -p ./SignOutput mkdir -p ./SignOutput
mv ./target/release/rustdesk-portable-packer.exe ./SignOutput/rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}.exe mv ./target/release/rustdesk-portable-packer.exe ./SignOutput/rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.exe
# - name: Rename rustdesk
# shell: bash
# run: |
# for name in rustdesk*??-install.exe; do
# mv "$name" ./SignOutput/"${name%%-install.exe}-${{ matrix.job.target }}.exe"
# done
- name: Sign rustdesk self-extracted file - name: Sign rustdesk self-extracted file
uses: GermanBluefox/code-sign-action@v7 uses: GermanBluefox/code-sign-action@v7
@ -148,7 +141,7 @@ jobs:
job: job:
# - { target: i686-pc-windows-msvc , os: windows-2019 } # - { target: i686-pc-windows-msvc , os: windows-2019 }
# - { target: x86_64-pc-windows-gnu , os: windows-2019 } # - { target: x86_64-pc-windows-gnu , os: windows-2019 }
- { target: i686-pc-windows-msvc, os: windows-2019 } - { target: i686-pc-windows-msvc, os: windows-2019, arch: x86 }
# - { target: aarch64-pc-windows-msvc, os: windows-2019 } # - { target: aarch64-pc-windows-msvc, os: windows-2019 }
steps: steps:
- name: Checkout source code - name: Checkout source code
@ -218,7 +211,7 @@ jobs:
python3 ./generate.py -f ../../Release/ -o . -e ../../Release/rustdesk.exe python3 ./generate.py -f ../../Release/ -o . -e ../../Release/rustdesk.exe
popd popd
mkdir -p ./SignOutput mkdir -p ./SignOutput
mv ./target/release/rustdesk-portable-packer.exe ./SignOutput/rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-sciter.exe mv ./target/release/rustdesk-portable-packer.exe ./SignOutput/rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}-sciter.exe
- name: Sign rustdesk self-extracted file - name: Sign rustdesk self-extracted file
uses: GermanBluefox/code-sign-action@v7 uses: GermanBluefox/code-sign-action@v7
@ -250,6 +243,7 @@ jobs:
target: x86_64-apple-darwin, target: x86_64-apple-darwin,
os: macos-latest, os: macos-latest,
extra-build-args: "", extra-build-args: "",
arch: x86_64
} }
steps: steps:
- name: Checkout source code - name: Checkout source code
@ -358,7 +352,7 @@ jobs:
- name: Rename rustdesk - name: Rename rustdesk
run: | run: |
for name in rustdesk*??.dmg; do for name in rustdesk*??.dmg; do
mv "$name" "${name%%.dmg}-${{ matrix.job.target }}.dmg" mv "$name" "${name%%.dmg}-${{ matrix.job.arch }}.dmg"
done done
- name: Publish DMG package - name: Publish DMG package
@ -368,7 +362,7 @@ jobs:
prerelease: true prerelease: true
tag_name: ${{ env.TAG_NAME }} tag_name: ${{ env.TAG_NAME }}
files: | files: |
rustdesk*-${{ matrix.job.target }}.dmg rustdesk*-${{ matrix.job.arch }}.dmg
build-vcpkg-deps-linux: build-vcpkg-deps-linux:
uses: ./.github/workflows/vcpkg-deps-linux.yml uses: ./.github/workflows/vcpkg-deps-linux.yml
@ -385,14 +379,14 @@ jobs:
matrix: matrix:
job: job:
- { - {
arch: x86_64, arch: aarch64,
target: aarch64-linux-android, target: aarch64-linux-android,
os: ubuntu-20.04, os: ubuntu-20.04,
extra-build-features: "", extra-build-features: "",
openssl-arch: android-arm64 openssl-arch: android-arm64
} }
- { - {
arch: x86_64, arch: armv7,
target: armv7-linux-androideabi, target: armv7-linux-androideabi,
os: ubuntu-20.04, os: ubuntu-20.04,
extra-build-features: "", extra-build-features: "",
@ -481,7 +475,7 @@ jobs:
# build flutter # build flutter
pushd flutter pushd flutter
flutter build apk --release --target-platform android-arm64 --split-per-abi flutter build apk --release --target-platform android-arm64 --split-per-abi
mv build/app/outputs/flutter-apk/app-arm64-v8a-release.apk ../rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-release.apk mv build/app/outputs/flutter-apk/app-arm64-v8a-release.apk ../rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.apk
;; ;;
armv7-linux-androideabi) armv7-linux-androideabi)
mkdir -p ./flutter/android/app/src/main/jniLibs/armeabi-v7a mkdir -p ./flutter/android/app/src/main/jniLibs/armeabi-v7a
@ -490,12 +484,12 @@ jobs:
# build flutter # build flutter
pushd flutter pushd flutter
flutter build apk --release --target-platform android-arm --split-per-abi flutter build apk --release --target-platform android-arm --split-per-abi
mv build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk ../rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-release.apk mv build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk ../rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.apk
;; ;;
esac esac
popd popd
mkdir -p signed-apk; pushd signed-apk mkdir -p signed-apk; pushd signed-apk
mv ../rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-release.apk . mv ../rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.apk .
- uses: r0adkll/sign-android-release@v1 - uses: r0adkll/sign-android-release@v1
name: Sign app APK name: Sign app APK
@ -515,7 +509,7 @@ jobs:
if: env.ANDROID_SIGNING_KEY != null && env.UPLOAD_ARTIFACT == 'true' if: env.ANDROID_SIGNING_KEY != null && env.UPLOAD_ARTIFACT == 'true'
uses: actions/upload-artifact@master uses: actions/upload-artifact@master
with: with:
name: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-release-signed.apk name: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.apk
path: ${{steps.sign-rustdesk.outputs.signedReleaseFile}} path: ${{steps.sign-rustdesk.outputs.signedReleaseFile}}
- name: Publish signed apk package - name: Publish signed apk package
@ -534,7 +528,7 @@ jobs:
prerelease: true prerelease: true
tag_name: ${{ env.TAG_NAME }} tag_name: ${{ env.TAG_NAME }}
files: | files: |
signed-apk/rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-release.apk signed-apk/rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.apk
build-rustdesk-lib-linux-amd64: build-rustdesk-lib-linux-amd64:
needs: [generate-bridge-linux, build-vcpkg-deps-linux] needs: [generate-bridge-linux, build-vcpkg-deps-linux]
@ -986,7 +980,7 @@ jobs:
run: | run: |
for name in rustdesk*??.deb; do for name in rustdesk*??.deb; do
# use cp to duplicate deb files to fit other packages. # use cp to duplicate deb files to fit other packages.
cp "$name" "${name%%.deb}-${{ matrix.job.target }}-${{ matrix.job.os }}-sciter.deb" cp "$name" "${name%%.deb}--${{ matrix.job.arch }}-sciter.deb"
done done
- name: Publish debian package - name: Publish debian package
@ -996,14 +990,14 @@ jobs:
prerelease: true prerelease: true
tag_name: ${{ env.TAG_NAME }} tag_name: ${{ env.TAG_NAME }}
files: | files: |
rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}-sciter.deb rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}-sciter.deb
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@master uses: actions/upload-artifact@master
if: ${{ contains(matrix.job.extra-build-features, 'flatpak') }} if: ${{ contains(matrix.job.extra-build-features, 'flatpak') }}
with: with:
name: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}-sciter.deb name: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}-sciter.deb
path: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}-sciter.deb path: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}-sciter.deb
build-rustdesk-linux-arm: build-rustdesk-linux-arm:
needs: [build-rustdesk-lib-linux-arm] needs: [build-rustdesk-lib-linux-arm]
@ -1159,7 +1153,7 @@ jobs:
shell: bash shell: bash
run: | run: |
for name in rustdesk*??.deb; do for name in rustdesk*??.deb; do
cp "$name" "${name%%.deb}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb" cp "$name" "${name%%.deb}-${{ matrix.job.arch }}.deb"
done done
- name: Publish debian package - name: Publish debian package
@ -1169,7 +1163,7 @@ jobs:
prerelease: true prerelease: true
tag_name: ${{ env.TAG_NAME }} tag_name: ${{ env.TAG_NAME }}
files: | files: |
rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb
- name: Build appimage package - name: Build appimage package
if: ${{ matrix.job.extra-build-features == 'appimage' }} if: ${{ matrix.job.extra-build-features == 'appimage' }}
@ -1198,8 +1192,8 @@ jobs:
uses: actions/upload-artifact@master uses: actions/upload-artifact@master
if: ${{ contains(matrix.job.extra-build-features, 'flatpak') }} if: ${{ contains(matrix.job.extra-build-features, 'flatpak') }}
with: with:
name: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb name: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb
path: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb path: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb
- name: Patch archlinux PKGBUILD - name: Patch archlinux PKGBUILD
if: ${{ matrix.job.extra-build-features == '' }} if: ${{ matrix.job.extra-build-features == '' }}
@ -1379,7 +1373,7 @@ jobs:
run: | run: |
for name in rustdesk*??.deb; do for name in rustdesk*??.deb; do
# use cp to duplicate deb files to fit other packages. # use cp to duplicate deb files to fit other packages.
cp "$name" "${name%%.deb}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb" cp "$name" "${name%%.deb}-${{ matrix.job.arch }}.deb"
done done
- name: Publish debian package - name: Publish debian package
@ -1389,14 +1383,14 @@ jobs:
prerelease: true prerelease: true
tag_name: ${{ env.TAG_NAME }} tag_name: ${{ env.TAG_NAME }}
files: | files: |
rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@master uses: actions/upload-artifact@master
if: ${{ contains(matrix.job.extra-build-features, 'flatpak') }} if: ${{ contains(matrix.job.extra-build-features, 'flatpak') }}
with: with:
name: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb name: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb
path: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb path: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb
- name: Patch archlinux PKGBUILD - name: Patch archlinux PKGBUILD
if: ${{ matrix.job.extra-build-features == '' }} if: ${{ matrix.job.extra-build-features == '' }}
@ -1559,12 +1553,12 @@ jobs:
- name: Download Binary - name: Download Binary
uses: actions/download-artifact@master uses: actions/download-artifact@master
with: with:
name: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb name: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb
path: . path: .
- name: Rename Binary - name: Rename Binary
run: | run: |
mv rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb rustdesk-${{ env.VERSION }}.deb mv rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.deb rustdesk-${{ env.VERSION }}.deb
- uses: Kingtous/run-on-arch-action@amd64-support - uses: Kingtous/run-on-arch-action@amd64-support
name: Build rustdesk flatpak package for ${{ matrix.job.arch }} name: Build rustdesk flatpak package for ${{ matrix.job.arch }}
@ -1596,7 +1590,7 @@ jobs:
pushd flatpak pushd flatpak
git clone https://github.com/flathub/shared-modules.git --depth=1 git clone https://github.com/flathub/shared-modules.git --depth=1
flatpak-builder --user --force-clean --repo=repo ./build ./rustdesk.json flatpak-builder --user --force-clean --repo=repo ./build ./rustdesk.json
flatpak build-bundle ./repo rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}.flatpak com.rustdesk.RustDesk flatpak build-bundle ./repo rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.flatpak com.rustdesk.RustDesk
- name: Publish flatpak package - name: Publish flatpak package
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
@ -1605,4 +1599,4 @@ jobs:
prerelease: true prerelease: true
tag_name: ${{ env.TAG_NAME }} tag_name: ${{ env.TAG_NAME }}
files: | files: |
flatpak/rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}.flatpak flatpak/rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.flatpak