From c157a5b1304c87c9d33f2f0894cdd7c3549cc96e Mon Sep 17 00:00:00 2001
From: botanicvelious <cyberempires@gmail.com>
Date: Mon, 16 Jan 2023 13:45:43 -0700
Subject: [PATCH] Change from NO_XYZ_KEYS to SKIP_

---
 .github/workflows/flutter-nightly.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml
index d27b151b3..bf092e5a7 100644
--- a/.github/workflows/flutter-nightly.yml
+++ b/.github/workflows/flutter-nightly.yml
@@ -21,8 +21,8 @@ env:
   RENDEZVOUS_SERVER2: '${{ secrets.RENDEZVOUS_SERVER2 }}'
   RENDEZVOUS_SERVER3: '${{ secrets.RENDEZVOUS_SERVER3 }}'
   # Ignore signing with key files if values below are set
-  NO_OSX_KEYS: ${{ secrets.NO_OSX_KEYS == 'true' }}
-  NO_APP_KEYS: ${{ secrets.NO_APP_KEYS == 'true' }}
+  SKIP_OSX_KEYS: ${{ secrets.SKIP_OSX_KEYS == 'true' }}
+  SKIP_APP_KEYS: ${{ secrets.SKIP_APP_KEYS == 'true' }}
 
 jobs:
   build-for-windows:
@@ -158,7 +158,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Import the codesign cert
-        if: ${{ env.NO_OSX_KEYS== 'true' }}
+        if: ${{ env.SKIP_OSX_KEYS== 'true' }}
         uses: apple-actions/import-codesign-certs@v1
         with: 
           p12-file-base64: ${{ secrets.MACOS_P12_BASE64 }}
@@ -166,13 +166,13 @@ jobs:
           keychain: rustdesk
       
       - name: Check sign and import sign key
-        if: ${{ env.NO_OSX_KEYS== 'true' }}
+        if: ${{ env.SKIP_OSX_KEYS== 'true' }}
         run: |
           security default-keychain -s rustdesk.keychain
           security find-identity -v
 
       - name: Import notarize key
-        if: ${{ env.NO_OSX_KEYS== 'true' }}
+        if: ${{ env.SKIP_OSX_KEYS== 'true' }}
         uses: timheuer/base64-to-file@v1.2
         with:
           # https://gregoryszorc.com/docs/apple-codesign/stable/apple_codesign_rcodesign.html#notarizing-and-stapling
@@ -181,7 +181,7 @@ jobs:
           encodedString: ${{ secrets.MACOS_NOTARIZE_JSON }}
           
       - name: Install rcodesign tool
-        if: ${{ env.NO_OSX_KEYS== 'true' }}
+        if: ${{ env.SKIP_OSX_KEYS== 'true' }}
         shell: bash
         run: | 
           pushd /tmp
@@ -252,7 +252,7 @@ jobs:
           ./build.py --flutter ${{ matrix.job.extra-build-args }}
 
       - name: Codesign app and create signed dmg
-        if: ${{ env.NO_OSX_KEYS== 'true' }}
+        if: ${{ env.SKIP_OSX_KEYS== 'true' }}
         run: |
           security default-keychain -s rustdesk.keychain
           security unlock-keychain -p ${{ secrets.MACOS_P12_PASSWORD }} rustdesk.keychain
@@ -565,7 +565,7 @@ jobs:
       
       - uses: r0adkll/sign-android-release@v1
         name: Sign app APK
-        if: ${{ env.NO_APP_KEYS== 'true' }}
+        if: ${{ env.SKIP_APP_KEYS== 'true' }}
         id: sign-rustdesk
         with:
           releaseDirectory: ./signed-apk
@@ -578,14 +578,14 @@ jobs:
           BUILD_TOOLS_VERSION: "30.0.2"
 
       - name: Upload Artifacts
-        if: ${{ env.NO_APP_KEYS== 'true' }}
+        if: ${{ env.SKIP_APP_KEYS== 'true' }}
         uses: actions/upload-artifact@master
         with:
           name: rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-release-signed.apk
           path: ${{steps.sign-rustdesk.outputs.signedReleaseFile}}
 
       - name: Publish signed apk package
-        if: ${{ env.NO_APP_KEYS== 'true' }}
+        if: ${{ env.SKIP_APP_KEYS== 'true' }}
         uses: softprops/action-gh-release@v1
         with:
           prerelease: true
@@ -594,7 +594,7 @@ jobs:
             ${{steps.sign-rustdesk.outputs.signedReleaseFile}}
 
       - name: Publish unsigned apk package
-        if: ${{ env.NO_APP_KEYS!= 'true' }}
+        if: ${{ env.SKIP_APP_KEYS!= 'true' }}
         uses: softprops/action-gh-release@v1
         with:
           prerelease: true