shaytan/rdgen
1
0
Fork 1
mirror of https://github.com/bryangerlach/rdgen.git synced 2025-11-29 00:23:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bryangerlach:master' into master

Browse Source
This commit is contained in:
MLPCR
2025-04-18 18:37:48 +00:00
committed by GitHub
parent bcef3a4026 0240a905f9
commit 131ec1759d
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/generator-linux.yml vendored
View File

@@ -810,6 +810,17 @@ jobs:
needs: [build-rustdesk-linux,build-flatpak,build-appimage] needs: [build-rustdesk-linux,build-flatpak,build-appimage]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: 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 - name: Report Status
uses: fjogeleit/http-request-action@v1 uses: fjogeleit/http-request-action@v1
with: with:

23
.github/workflows/generator-macos.yml vendored
View File

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