Skip to content

Commit

Permalink
CI: Support merge queues with default runner
Browse files Browse the repository at this point in the history
  • Loading branch information
Repiteo committed Sep 26, 2024
1 parent a0d1ba4 commit 513f688
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/android_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,6 @@ jobs:
- name: Upload artifact
uses: ./.github/actions/upload-artifact
if: github.event_name != 'merge_group'
with:
name: ${{ matrix.cache-name }}
1 change: 1 addition & 0 deletions .github/workflows/ios_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ jobs:

- name: Upload artifact
uses: ./.github/actions/upload-artifact
if: github.event_name != 'merge_group'
6 changes: 3 additions & 3 deletions .github/workflows/linux_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,20 +160,20 @@ jobs:
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
- name: Prepare artifact
if: matrix.artifact
if: matrix.artifact && github.event_name != 'merge_group'
run: |
strip bin/godot.*
chmod +x bin/godot.*
- name: Upload artifact
uses: ./.github/actions/upload-artifact
if: matrix.artifact
if: matrix.artifact && github.event_name != 'merge_group'
with:
name: ${{ matrix.cache-name }}

- name: Dump Godot API
uses: ./.github/actions/godot-api-dump
if: matrix.api-dump
if: matrix.api-dump && github.event_name != 'merge_group'
with:
bin: ${{ matrix.bin }}

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/macos_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ jobs:
continue-on-error: true

- name: Prepare artifact
if: github.event_name != 'merge_group'
run: |
lipo -create ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64 -output ./bin/godot.macos.${{ matrix.target }}.universal
rm ./bin/godot.macos.${{ matrix.target }}.x86_64 ./bin/godot.macos.${{ matrix.target }}.arm64
Expand All @@ -83,6 +84,7 @@ jobs:
- name: Upload artifact
uses: ./.github/actions/upload-artifact
if: github.event_name != 'merge_group'
with:
name: ${{ matrix.cache-name }}

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/runner.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 🔗 GHA
on: [push, pull_request]
on: [push, pull_request, merge_group]

concurrency:
group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-runner
Expand Down Expand Up @@ -51,6 +51,7 @@ jobs:
# until both the upstream PR and the matching godot-cpp changes are merged.
godot-cpp-test:
name: 🪲 Godot CPP
if: github.event_name != 'merge_group'
# This can be changed to depend on another platform, if we decide to use it for
# godot-cpp instead. Make sure to move the .github/actions/godot-api-dump step
# appropriately.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/web_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,6 @@ jobs:

- name: Upload artifact
uses: ./.github/actions/upload-artifact
if: matrix.artifact
if: matrix.artifact && github.event_name != 'merge_group'
with:
name: ${{ matrix.cache-name }}
4 changes: 2 additions & 2 deletions .github/workflows/windows_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ jobs:
continue-on-error: true

- name: Prepare artifact
if: ${{ matrix.artifact }}
if: matrix.artifact && github.event_name != 'merge_group'
run: |
Remove-Item bin/* -Include *.exp,*.lib,*.pdb -Force
- name: Upload artifact
if: ${{ matrix.artifact }}
if: matrix.artifact && github.event_name != 'merge_group'
uses: ./.github/actions/upload-artifact
with:
name: ${{ matrix.cache-name }}
Expand Down

0 comments on commit 513f688

Please sign in to comment.