Skip to content

Commit 793357a

Browse files
committed
Merge branch 'release-20.0-github' into mhamza/backport-16255
Signed-off-by: Mohamed Hamza <[email protected]>
2 parents afff925 + 50a5578 commit 793357a

20 files changed

+21
-21
lines changed

.github/workflows/codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions: read-all
99
jobs:
1010
test:
1111
name: Code Coverage
12-
runs-on: gh-hosted-runners-16cores-1-24.04
12+
runs-on: ${{ github.repository_owner == 'vitessio' && 'gh-hosted-runners-16cores-1-24.04' || 'ubuntu-24.04' }}
1313

1414
steps:
1515
- name: Check out code

.github/workflows/docker_build_images.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions: read-all
1515
jobs:
1616
build_and_push_lite:
1717
name: Build and push vitess/lite Docker images
18-
runs-on: gh-hosted-runners-16cores-1-24.04
18+
runs-on: ${{ github.repository_owner == 'vitessio' && 'gh-hosted-runners-16cores-1-24.04' || 'ubuntu-24.04' }}
1919
if: github.repository == 'vitessio/vitess'
2020

2121
strategy:
@@ -80,7 +80,7 @@ jobs:
8080
build_and_push_components:
8181
name: Build and push vitess components Docker images
8282
needs: build_and_push_lite
83-
runs-on: gh-hosted-runners-16cores-1-24.04
83+
runs-on: ${{ github.repository_owner == 'vitessio' && 'gh-hosted-runners-16cores-1-24.04' || 'ubuntu-24.04' }}
8484
if: github.repository == 'vitessio/vitess'
8585

8686
strategy:

.github/workflows/local_example.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55

66
build:
77
name: Local example using ${{ matrix.topo }} on Ubuntu
8-
runs-on: gh-hosted-runners-16cores-1-24.04
8+
runs-on: ${{ github.repository_owner == 'vitessio' && 'gh-hosted-runners-16cores-1-24.04' || 'ubuntu-24.04' }}
99
strategy:
1010
matrix:
1111
topo: [consul,etcd,zk2]

.github/workflows/region_example.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55

66
build:
77
name: Region Sharding example using ${{ matrix.topo }} on Ubuntu
8-
runs-on: gh-hosted-runners-16cores-1-24.04
8+
runs-on: ${{ github.repository_owner == 'vitessio' && 'gh-hosted-runners-16cores-1-24.04' || 'ubuntu-24.04' }}
99
strategy:
1010
matrix:
1111
topo: [etcd]

.github/workflows/unit_race.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
build:
1717
name: Unit Test (Race)
18-
runs-on: gh-hosted-runners-16cores-1-24.04
18+
runs-on: ${{ github.repository_owner == 'vitessio' && 'gh-hosted-runners-16cores-1-24.04' || 'ubuntu-24.04' }}
1919
steps:
2020
- name: Skip CI
2121
run: |

.github/workflows/unit_race_evalengine.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
build:
1717
name: Unit Test (Evalengine_Race)
18-
runs-on: gh-hosted-runners-16cores-1-24.04
18+
runs-on: ${{ github.repository_owner == 'vitessio' && 'gh-hosted-runners-16cores-1-24.04' || 'ubuntu-24.04' }}
1919
steps:
2020
- name: Skip CI
2121
run: |

.github/workflows/upgrade_downgrade_test_backups_e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
upgrade_downgrade_test_e2e:
1414
timeout-minutes: 60
1515
name: Run Upgrade Downgrade Test - Backups - E2E
16-
runs-on: gh-hosted-runners-16cores-1-24.04
16+
runs-on: ${{ github.repository_owner == 'vitessio' && 'gh-hosted-runners-16cores-1-24.04' || 'ubuntu-24.04' }}
1717

1818
steps:
1919
- name: Skip CI

.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
upgrade_downgrade_test_e2e:
1515
timeout-minutes: 60
1616
name: Run Upgrade Downgrade Test - Backups - E2E - Next Release
17-
runs-on: gh-hosted-runners-16cores-1-24.04
17+
runs-on: ${{ github.repository_owner == 'vitessio' && 'gh-hosted-runners-16cores-1-24.04' || 'ubuntu-24.04' }}
1818

1919
steps:
2020
- name: Skip CI

.github/workflows/upgrade_downgrade_test_backups_manual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
upgrade_downgrade_test_manual:
1616
timeout-minutes: 40
1717
name: Run Upgrade Downgrade Test - Backups - Manual
18-
runs-on: gh-hosted-runners-16cores-1-24.04
18+
runs-on: ${{ github.repository_owner == 'vitessio' && 'gh-hosted-runners-16cores-1-24.04' || 'ubuntu-24.04' }}
1919

2020
steps:
2121
- name: Skip CI

.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
upgrade_downgrade_test_manual:
1616
timeout-minutes: 40
1717
name: Run Upgrade Downgrade Test - Backups - Manual - Next Release
18-
runs-on: gh-hosted-runners-16cores-1-24.04
18+
runs-on: ${{ github.repository_owner == 'vitessio' && 'gh-hosted-runners-16cores-1-24.04' || 'ubuntu-24.04' }}
1919

2020
steps:
2121
- name: Skip CI

0 commit comments

Comments
 (0)