From 9f23f1c94ae58208ae8545a4ed233d30a824fb52 Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Thu, 17 Apr 2025 08:35:42 -0500 Subject: [PATCH 1/4] fix linux deploy for api server --- .github/workflows/generator-linux.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/generator-linux.yml b/.github/workflows/generator-linux.yml index 961139c..6a46b98 100644 --- a/.github/workflows/generator-linux.yml +++ b/.github/workflows/generator-linux.yml @@ -806,6 +806,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: From 465a9d3554e73c294c3f0c6fde7c5188e93f603f Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Fri, 18 Apr 2025 09:41:49 -0500 Subject: [PATCH 2/4] fix macos --- .github/workflows/generator-macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generator-macos.yml b/.github/workflows/generator-macos.yml index 3bd46ed..f35cf89 100644 --- a/.github/workflows/generator-macos.yml +++ b/.github/workflows/generator-macos.yml @@ -120,12 +120,12 @@ jobs: - name: Set rdgen value if: ${{ fromJson(inputs.extras).rdgen == 'true' }} run: | - echo "STATUS_URL=${{ secrets.GENURL }}/updategh" >> $env:GITHUB_ENV + 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 + echo "STATUS_URL=${{ inputs.apiServer }}/api/updategh" >> GITHUB_ENV - name: Report Status uses: fjogeleit/http-request-action@v1 From 8577a25657d4a85b82203b119f6db24fb1dd0c82 Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Fri, 18 Apr 2025 09:53:00 -0500 Subject: [PATCH 3/4] fix macos --- .github/workflows/generator-macos.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/generator-macos.yml b/.github/workflows/generator-macos.yml index f35cf89..f1a5389 100644 --- a/.github/workflows/generator-macos.yml +++ b/.github/workflows/generator-macos.yml @@ -127,6 +127,9 @@ jobs: 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 with: From 0240a905f99cdf6812bb42d10dbe872a9804716d Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Fri, 18 Apr 2025 10:04:35 -0500 Subject: [PATCH 4/4] fix macos --- .github/workflows/generator-macos.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/generator-macos.yml b/.github/workflows/generator-macos.yml index f1a5389..9dac29e 100644 --- a/.github/workflows/generator-macos.yml +++ b/.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,15 @@ 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" >> 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" >> 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