Merge pull request #2859 from botanicvelious/master
fix key check in nightly yaml
This commit is contained in:
commit
f54d72e900
23
.github/workflows/flutter-nightly.yml
vendored
23
.github/workflows/flutter-nightly.yml
vendored
@ -15,6 +15,10 @@ env:
|
|||||||
# for multiarch gcc compatibility
|
# for multiarch gcc compatibility
|
||||||
VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44"
|
VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44"
|
||||||
VERSION: "1.2.0"
|
VERSION: "1.2.0"
|
||||||
|
#signing keys env variable checks
|
||||||
|
ANDROID_SIGNING_KEY: '${{ secrets.ANDROID_SIGNING_KEY }}'
|
||||||
|
MACOS_P12_BASE64: '${{ secrets.MACOS_P12_BASE64 }}'
|
||||||
|
# To make a custom build with your own servers set the below secret values
|
||||||
RS_PUB_KEY: '${{ secrets.RS_PUB_KEY }}'
|
RS_PUB_KEY: '${{ secrets.RS_PUB_KEY }}'
|
||||||
RENDEZVOUS_SERVER: '${{ secrets.RENDEZVOUS_SERVER }}'
|
RENDEZVOUS_SERVER: '${{ secrets.RENDEZVOUS_SERVER }}'
|
||||||
|
|
||||||
@ -152,6 +156,7 @@ jobs:
|
|||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Import the codesign cert
|
- name: Import the codesign cert
|
||||||
|
if: env.MACOS_P12_BASE64 != null
|
||||||
uses: apple-actions/import-codesign-certs@v1
|
uses: apple-actions/import-codesign-certs@v1
|
||||||
with:
|
with:
|
||||||
p12-file-base64: ${{ secrets.MACOS_P12_BASE64 }}
|
p12-file-base64: ${{ secrets.MACOS_P12_BASE64 }}
|
||||||
@ -159,11 +164,13 @@ jobs:
|
|||||||
keychain: rustdesk
|
keychain: rustdesk
|
||||||
|
|
||||||
- name: Check sign and import sign key
|
- name: Check sign and import sign key
|
||||||
|
if: env.MACOS_P12_BASE64 != null
|
||||||
run: |
|
run: |
|
||||||
security default-keychain -s rustdesk.keychain
|
security default-keychain -s rustdesk.keychain
|
||||||
security find-identity -v
|
security find-identity -v
|
||||||
|
|
||||||
- name: Import notarize key
|
- name: Import notarize key
|
||||||
|
if: env.MACOS_P12_BASE64 != null
|
||||||
uses: timheuer/base64-to-file@v1.2
|
uses: timheuer/base64-to-file@v1.2
|
||||||
with:
|
with:
|
||||||
# https://gregoryszorc.com/docs/apple-codesign/stable/apple_codesign_rcodesign.html#notarizing-and-stapling
|
# https://gregoryszorc.com/docs/apple-codesign/stable/apple_codesign_rcodesign.html#notarizing-and-stapling
|
||||||
@ -172,6 +179,7 @@ jobs:
|
|||||||
encodedString: ${{ secrets.MACOS_NOTARIZE_JSON }}
|
encodedString: ${{ secrets.MACOS_NOTARIZE_JSON }}
|
||||||
|
|
||||||
- name: Install rcodesign tool
|
- name: Install rcodesign tool
|
||||||
|
if: env.MACOS_P12_BASE64 != null
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
pushd /tmp
|
pushd /tmp
|
||||||
@ -242,6 +250,7 @@ jobs:
|
|||||||
./build.py --flutter ${{ matrix.job.extra-build-args }}
|
./build.py --flutter ${{ matrix.job.extra-build-args }}
|
||||||
|
|
||||||
- name: Codesign app and create signed dmg
|
- name: Codesign app and create signed dmg
|
||||||
|
if: env.MACOS_P12_BASE64 != null
|
||||||
run: |
|
run: |
|
||||||
security default-keychain -s rustdesk.keychain
|
security default-keychain -s rustdesk.keychain
|
||||||
security unlock-keychain -p ${{ secrets.MACOS_P12_PASSWORD }} rustdesk.keychain
|
security unlock-keychain -p ${{ secrets.MACOS_P12_PASSWORD }} rustdesk.keychain
|
||||||
@ -554,6 +563,7 @@ jobs:
|
|||||||
|
|
||||||
- uses: r0adkll/sign-android-release@v1
|
- uses: r0adkll/sign-android-release@v1
|
||||||
name: Sign app APK
|
name: Sign app APK
|
||||||
|
if: env.ANDROID_SIGNING_KEY != null
|
||||||
id: sign-rustdesk
|
id: sign-rustdesk
|
||||||
with:
|
with:
|
||||||
releaseDirectory: ./signed-apk
|
releaseDirectory: ./signed-apk
|
||||||
@ -566,12 +576,14 @@ jobs:
|
|||||||
BUILD_TOOLS_VERSION: "30.0.2"
|
BUILD_TOOLS_VERSION: "30.0.2"
|
||||||
|
|
||||||
- name: Upload Artifacts
|
- name: Upload Artifacts
|
||||||
|
if: env.ANDROID_SIGNING_KEY != null
|
||||||
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.target }}-release-signed.apk
|
||||||
path: ${{steps.sign-rustdesk.outputs.signedReleaseFile}}
|
path: ${{steps.sign-rustdesk.outputs.signedReleaseFile}}
|
||||||
|
|
||||||
- name: Publish apk package
|
- name: Publish signed apk package
|
||||||
|
if: env.ANDROID_SIGNING_KEY != null
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
with:
|
with:
|
||||||
prerelease: true
|
prerelease: true
|
||||||
@ -579,6 +591,15 @@ jobs:
|
|||||||
files: |
|
files: |
|
||||||
${{steps.sign-rustdesk.outputs.signedReleaseFile}}
|
${{steps.sign-rustdesk.outputs.signedReleaseFile}}
|
||||||
|
|
||||||
|
- name: Publish unsigned apk package
|
||||||
|
if: env.ANDROID_SIGNING_KEY == null
|
||||||
|
uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
prerelease: true
|
||||||
|
tag_name: ${{ env.TAG_NAME }}
|
||||||
|
files: |
|
||||||
|
../rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-release.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]
|
||||||
name: build-rust-lib ${{ matrix.job.target }} (${{ matrix.job.os }}) [${{ matrix.job.extra-build-features }}]
|
name: build-rust-lib ${{ matrix.job.target }} (${{ matrix.job.os }}) [${{ matrix.job.extra-build-features }}]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user