Skip to content

Commit f8aa329

Browse files
roryabrahamOSBotify
authored andcommitted
Merge pull request #20104 from Expensify/andrew-revert
(cherry picked from commit aade714)
1 parent 86558b0 commit f8aa329

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

.github/actionlint.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
self-hosted-runner:
33
labels:
44
- ubuntu-20.04-64core
5-
- ubuntu-latest-16-cores
65
- macos-12-xl

.github/scripts/validateActionsAndWorkflows.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ else
8686
fi
8787

8888
info 'Linting workflows...'
89-
./actionlint -color -ignore '"runs-on" section must be sequence node but got mapping node with "!!map" tag' || EXIT_CODE=1
89+
./actionlint -color || EXIT_CODE=1
9090
if [[ "$EXIT_CODE" == 0 ]]; then
9191
success 'Workflows passed actionlint!'
9292
fi

.github/workflows/platformDeploy.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ jobs:
2929
name: Build and deploy Android
3030
needs: validateActor
3131
if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
32-
runs-on:
33-
labels: ubuntu-latest-16-cores
32+
runs-on: ubuntu-latest
3433
steps:
3534
# This action checks-out the repository, so the workflow can access it.
3635
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
@@ -240,8 +239,7 @@ jobs:
240239
name: Build and deploy Web
241240
needs: validateActor
242241
if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
243-
runs-on:
244-
labels: ubuntu-latest-16-cores
242+
runs-on: ubuntu-latest
245243
steps:
246244
# This action checks-out the repository, so the workflow can access it.
247245
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8

.github/workflows/testBuild.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ jobs:
6262
name: Build and deploy Android for testing
6363
needs: [validateActor, getBranchRef]
6464
if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
65-
runs-on:
66-
labels: ubuntu-latest-16-cores
65+
runs-on: ubuntu-latest
6766
env:
6867
PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
6968
steps:
@@ -233,8 +232,7 @@ jobs:
233232
if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
234233
env:
235234
PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
236-
runs-on:
237-
labels: ubuntu-latest-16-cores
235+
runs-on: ubuntu-latest
238236
steps:
239237
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
240238
with:

0 commit comments

Comments
 (0)