From 937906fdd4685d1fb5c55c829dc55a1459adc06d Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Tue, 15 Oct 2024 17:34:24 -0500 Subject: [PATCH] allow building from master --- .github/workflows/bridge.yml | 7 +++++++ .github/workflows/generator-android.yml | 7 +++++++ .github/workflows/generator-linux.yml | 7 +++++++ .github/workflows/generator-windows.yml | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/.github/workflows/bridge.yml b/.github/workflows/bridge.yml index 881b958..dacaab8 100644 --- a/.github/workflows/bridge.yml +++ b/.github/workflows/bridge.yml @@ -30,10 +30,17 @@ jobs: } steps: - name: Checkout source code + if: ${{ inputs.version != 'master' }} uses: actions/checkout@v4 with: repository: rustdesk/rustdesk ref: refs/tags/${{ inputs.version }} + + - name: Checkout source code + if: ${{ inputs.version == 'master' }} + uses: actions/checkout@v4 + with: + repository: rustdesk/rustdesk - name: Install prerequisites run: | diff --git a/.github/workflows/generator-android.yml b/.github/workflows/generator-android.yml index 3cc0457..f374975 100644 --- a/.github/workflows/generator-android.yml +++ b/.github/workflows/generator-android.yml @@ -196,10 +196,17 @@ jobs: wget - name: Checkout source code + if: ${{ env.VERSION != 'master' }} uses: actions/checkout@v4 with: repository: rustdesk/rustdesk ref: refs/tags/${{ env.VERSION }} + + - name: Checkout source code + if: ${{ env.VERSION == 'master' }} + uses: actions/checkout@v4 + with: + repository: rustdesk/rustdesk - name: Install flutter uses: subosito/flutter-action@v2 diff --git a/.github/workflows/generator-linux.yml b/.github/workflows/generator-linux.yml index 6da9489..1f7c20d 100644 --- a/.github/workflows/generator-linux.yml +++ b/.github/workflows/generator-linux.yml @@ -158,11 +158,18 @@ jobs: sudo apt-get install -y imagemagick - name: Checkout source code + if: ${{ env.VERSION != 'master' }} uses: actions/checkout@v4 with: repository: rustdesk/rustdesk ref: refs/tags/${{ env.VERSION }} + - name: Checkout source code + if: ${{ env.VERSION == 'master' }} + uses: actions/checkout@v4 + with: + repository: rustdesk/rustdesk + - name: Set Swap Space if: ${{ matrix.job.arch == 'x86_64' }} uses: pierotofy/set-swap-space@master diff --git a/.github/workflows/generator-windows.yml b/.github/workflows/generator-windows.yml index 3770bfc..0e054a6 100644 --- a/.github/workflows/generator-windows.yml +++ b/.github/workflows/generator-windows.yml @@ -143,11 +143,18 @@ jobs: data: '{"uuid": "${{ inputs.uuid }}", "status": "5% complete"}' - name: Checkout source code + if: ${{ env.VERSION != 'master' }} uses: actions/checkout@v4 with: repository: rustdesk/rustdesk ref: refs/tags/${{ env.VERSION }} + - name: Checkout source code + if: ${{ env.VERSION == 'master' }} + uses: actions/checkout@v4 + with: + repository: rustdesk/rustdesk + - name: Install ImageMagick on Windows run: | choco install -y imagemagick.app --no-progress