Merge pull request #20104 from Expensify/andrew-revert

Expensify · Jun 2, 2023 · aade714 · aade714
2 parents 9bd3557 + 851ea56
commit aade714
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
@@ -2,5 +2,4 @@
 self-hosted-runner:
   labels:
     - ubuntu-20.04-64core
-    - ubuntu-latest-16-cores
     - macos-12-xl
diff --git a/.github/scripts/validateActionsAndWorkflows.sh b/.github/scripts/validateActionsAndWorkflows.sh
@@ -84,7 +84,7 @@ else
 fi
 
 info 'Linting workflows...'
-./actionlint -color -ignore '"runs-on" section must be sequence node but got mapping node with "!!map" tag' || EXIT_CODE=1
+./actionlint -color || EXIT_CODE=1
 if [[ "$EXIT_CODE" == 0 ]]; then
   success 'Workflows passed actionlint!'
 fi

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -29,8 +29,7 @@ jobs:
     name: Build and deploy Android
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
-    runs-on:
-      labels: ubuntu-latest-16-cores
+    runs-on: ubuntu-latest
     steps:
       # This action checks-out the repository, so the workflow can access it.
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
@@ -240,8 +239,7 @@ jobs:
     name: Build and deploy Web
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
-    runs-on:
-      labels: ubuntu-latest-16-cores
+    runs-on: ubuntu-latest
     steps:
       # This action checks-out the repository, so the workflow can access it.
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
@@ -62,8 +62,7 @@ jobs:
     name: Build and deploy Android for testing
     needs: [validateActor, getBranchRef]
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
-    runs-on:
-      labels: ubuntu-latest-16-cores
+    runs-on: ubuntu-latest
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
     steps:
@@ -233,8 +232,7 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
-    runs-on:
-      labels: ubuntu-latest-16-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with: