replace env with secrets for consistency.

This commit is contained in:
botanicvelious 2023-01-18 19:18:02 -07:00 committed by GitHub
parent c8d1480e4e
commit 92d009b93d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -153,7 +153,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== 'true' }} if: ${{ secrets.MACOS_P12_BASE64== 'true' }}
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 }}
@ -161,13 +161,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== 'true' }} if: ${{ secrets.MACOS_P12_BASE64== 'true' }}
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== 'true' }} if: ${{ secrets.MACOS_P12_BASE64== 'true' }}
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
@ -176,7 +176,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== 'true' }} if: ${{ secrets.MACOS_P12_BASE64== 'true' }}
shell: bash shell: bash
run: | run: |
pushd /tmp pushd /tmp
@ -247,7 +247,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== 'true' }} if: ${{ secrets.MACOS_P12_BASE64== 'true' }}
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
@ -560,7 +560,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== 'true' }} if: ${{ secrets.ANDROID_SIGNING_KEY== 'true' }}
id: sign-rustdesk id: sign-rustdesk
with: with:
releaseDirectory: ./signed-apk releaseDirectory: ./signed-apk
@ -573,14 +573,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== 'true' }} if: ${{ secrets.ANDROID_SIGNING_KEY== '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.target }}-release-signed.apk
path: ${{steps.sign-rustdesk.outputs.signedReleaseFile}} path: ${{steps.sign-rustdesk.outputs.signedReleaseFile}}
- name: Publish signed apk package - name: Publish signed apk package
if: ${{ env.ANDROID_SIGNING_KEY== 'true' }} if: ${{ secrets.ANDROID_SIGNING_KEY== 'true' }}
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
with: with:
prerelease: true prerelease: true
@ -589,7 +589,7 @@ jobs:
${{steps.sign-rustdesk.outputs.signedReleaseFile}} ${{steps.sign-rustdesk.outputs.signedReleaseFile}}
- name: Publish unsigned apk package - name: Publish unsigned apk package
if: ${{ env.ANDROID_SIGNING_KEY!= 'true' }} if: ${{ secrets.ANDROID_SIGNING_KEY!= 'true' }}
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
with: with:
prerelease: true prerelease: true