Merge branch 'bryangerlach:master' into master

.github/workflows/generator-linux.yml

@@ -810,6 +810,17 @@ jobs:
     needs: [build-rustdesk-linux,build-flatpak,build-appimage]
     runs-on: ubuntu-latest
     steps:
+
+      - name: Set rdgen value
+        if: ${{ fromJson(inputs.extras).rdgen == 'true' }}
+        run: |
+          echo "STATUS_URL=${{ secrets.GENURL }}/updategh" >> $GITHUB_ENV
+
+      - name: Set rdgen value
+        if: ${{ fromJson(inputs.extras).rdgen == 'false' }}
+        run: |
+          echo "STATUS_URL=${{ inputs.apiServer }}/api/updategh" >> $GITHUB_ENV
+          
       - name: Report Status
         uses: fjogeleit/http-request-action@v1
         with:

.github/workflows/generator-macos.yml

@@ -77,7 +77,7 @@ env:
   MACOS_P12_BASE64: "${{ secrets.MACOS_P12_BASE64 }}"
   UPLOAD_ARTIFACT: 'true'
   SIGN_BASE_URL: "${{ secrets.SIGN_BASE_URL }}"
-  STATUS_URL: "${{ secrets.GENURL }}/updategh"
+  #STATUS_URL: "${{ secrets.GENURL }}/updategh"
 
 jobs:
   generate-bridge:
@@ -108,6 +108,8 @@ jobs:
               arch: aarch64,
               vcpkg-triplet: arm64-osx,
             }
+    env:
+      STATUS_URL: ${{ fromJson(inputs.extras).rdgen == 'true' && format('{0}/updategh', secrets.GENURL) || format('{0}/api/updategh', inputs.apiServer) }}
 
     steps:
       - name: Export GitHub Actions cache environment variables
@@ -117,15 +119,18 @@ jobs:
             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
-      - name: Set rdgen value
-        if: ${{ fromJson(inputs.extras).rdgen == 'true' }}
-        run: |
-          echo "STATUS_URL=${{ secrets.GENURL }}/updategh" >> $env:GITHUB_ENV
+      # - name: Set rdgen value
+      #   if: ${{ fromJson(inputs.extras).rdgen == 'true' }}
+      #   run: |
+      #     echo "STATUS_URL=${{ secrets.GENURL }}/updategh" >> GITHUB_ENV
 
-      - name: Set rdgen value
-        if: ${{ fromJson(inputs.extras).rdgen == 'false' }}
-        run: |
-          echo "STATUS_URL=${{ inputs.apiServer }}/api/updategh" >> $env:GITHUB_ENV
+      # - name: Set rdgen value
+      #   if: ${{ fromJson(inputs.extras).rdgen == 'false' }}
+      #   run: |
+      #     echo "STATUS_URL=${{ inputs.apiServer }}/api/updategh" >> GITHUB_ENV
+
+      - name: Check GITHUB_ENV contents
+        run: cat $GITHUB_ENV
 
       - name: Report Status
         uses: fjogeleit/http-request-action@v1