From 34a202ade01f36468df529127456a0d3047b542f Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Tue, 18 Jul 2023 13:46:38 -0700
Subject: [PATCH 1/2] ci: lint all packages in one job

---
 .github/workflows/test-all-packages.yml | 11 +++--------
 scripts/lint-with-types.sh              | 22 ----------------------
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100755 scripts/lint-with-types.sh

diff --git a/.github/workflows/test-all-packages.yml b/.github/workflows/test-all-packages.yml
index ec0b88ac680..7a3d476978a 100644
--- a/.github/workflows/test-all-packages.yml
+++ b/.github/workflows/test-all-packages.yml
@@ -91,12 +91,10 @@ jobs:
         with:
           node-version: '18.x'
 
-      # first job also does repo-level linting
       - name: lint repo format
         run: yarn lint:format
-      # eslint
-      - name: yarn lint primary
-        run: ./scripts/lint-with-types.sh primary
+      # eslint and tsc
+      - run: yarn lint:packages
       # build the API docs to verify it works
       - name: build API docs
         run: yarn docs
@@ -104,9 +102,8 @@ jobs:
       - name: build API docs in markdown
         run: yarn docs:markdown-for-agoric-documentation-repo
 
+  # A second job for what's not covered in primary
   lint-rest:
-    timeout-minutes: 15
-    needs: build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -117,8 +114,6 @@ jobs:
       # Check some of a3p-integration in this job that runs on PRs instead of
       # waiting for the slow integration test that by default only runs in the
       # master merge check
-      - name: yarn lint rest of packages/*
-        run: ./scripts/lint-with-types.sh rest
       - name: Lint a3p-integration
         run: yarn install && yarn lint && yarn doctor
         working-directory: a3p-integration
diff --git a/scripts/lint-with-types.sh b/scripts/lint-with-types.sh
deleted file mode 100755
index a2821b626b0..00000000000
--- a/scripts/lint-with-types.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# TODO consolidate back into one job https://github.com/Agoric/agoric-sdk/pull/8061
-
-# argument used by CI to split this across two jobs
-SCOPE=$1
-
-# taking roughly half the time to eslint all packages
-PRIMARY_PACKAGES="@agoric/{cosmos,ertp,governance,inter-protocol,swing-store,swingset-vat,vats,wallet,zoe}"
-
-case $SCOPE in
-  primary)
-    yarn lerna run --scope=$PRIMARY_PACKAGES --no-bail lint
-    ;;
-  rest)
-    yarn lerna run --ignore=$PRIMARY_PACKAGES --no-bail lint
-    ;;
-  *)
-    echo "The regular lint command now lints with types. Just use that."
-    exit 0
-    ;;
-esac

From a1d4261d990a3c761c9badcc6564625de602c216 Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Thu, 14 Nov 2024 14:49:44 -0800
Subject: [PATCH 2/2] ci: allow 20 min for lint-primary

---
 .github/workflows/test-all-packages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-all-packages.yml b/.github/workflows/test-all-packages.yml
index 7a3d476978a..36303e25eea 100644
--- a/.github/workflows/test-all-packages.yml
+++ b/.github/workflows/test-all-packages.yml
@@ -82,7 +82,7 @@ jobs:
   # We split the package tests into two jobs because type linting
   # is inefficient and slow https://github.com/typescript-eslint/typescript-eslint/issues/2094
   lint-primary:
-    timeout-minutes: 15
+    timeout-minutes: 20
     needs: build
     runs-on: ubuntu-latest
     steps: