From 1adb0b5515f0372cc13af8ec9273595e0e6529c8 Mon Sep 17 00:00:00 2001 From: Marlow Payne Date: Fri, 1 May 2026 21:57:57 -0700 Subject: [PATCH 1/8] ci: Add more PR trigger types for CI --- .github/workflows/monkey-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/monkey-ci.yml b/.github/workflows/monkey-ci.yml index 0fde717a5d06..be3f5da9a832 100644 --- a/.github/workflows/monkey-ci.yml +++ b/.github/workflows/monkey-ci.yml @@ -11,7 +11,7 @@ permissions: on: pull_request: branches: [main] - types: [opened, synchronize] + types: [opened, reopened, synchronize, labeled, ready_for_review] concurrency: group: group-${{ github.ref }}-${{ github.workflow }} From 18bf3c43d4cf91a265489ff0ffe3872e7718ac74 Mon Sep 17 00:00:00 2001 From: Marlow Payne Date: Fri, 1 May 2026 22:19:04 -0700 Subject: [PATCH 2/8] ci: Install Turbo for CI jobs --- .github/workflows/monkey-ci.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/monkey-ci.yml b/.github/workflows/monkey-ci.yml index be3f5da9a832..187fa161fceb 100644 --- a/.github/workflows/monkey-ci.yml +++ b/.github/workflows/monkey-ci.yml @@ -102,6 +102,10 @@ jobs: name: Install dependencies run: CI=true pnpm i --frozen-lockfile + - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} + name: Install Turbo + run: npm i turbo-linux-x64 --no-save + ci-be: name: ci-be needs: [pre-ci, prime-cache] @@ -142,6 +146,10 @@ jobs: name: Install dependencies run: CI=true pnpm i --frozen-lockfile + - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} + name: Install Turbo + run: npm i turbo-linux-x64 --no-save + - name: Check lint run: npm run lint-fast-be && npm run lint-be @@ -195,6 +203,10 @@ jobs: name: Install dependencies run: CI=true pnpm i --frozen-lockfile + - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} + name: Install Turbo + run: npm i turbo-linux-x64 --no-save + - name: Check lint run: npm run lint-fast-fe && npm run lint-fe @@ -262,6 +274,10 @@ jobs: name: Install dependencies run: CI=true pnpm i --frozen-lockfile + - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} + name: Install Turbo + run: npm i turbo-linux-x64 --no-save + - name: Lint styles if: steps.filter.outputs.styles == 'true' || contains(github.event.pull_request.labels.*.name, 'force-full-ci') run: npm run lint-styles @@ -321,6 +337,10 @@ jobs: name: Install dependencies run: CI=true pnpm i --frozen-lockfile + - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} + name: Install Turbo + run: npm i turbo-linux-x64 --no-save + - name: Check lint run: npm run lint-fast-pkg && npm run lint-pkg From 661456c2344fa8daefb60ad2137ca50f2279ac45 Mon Sep 17 00:00:00 2001 From: Marlow Payne Date: Fri, 1 May 2026 22:23:53 -0700 Subject: [PATCH 3/8] ci: Add a way to refresh CI cache --- .github/workflows/monkey-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/monkey-ci.yml b/.github/workflows/monkey-ci.yml index 187fa161fceb..a3b53736ea99 100644 --- a/.github/workflows/monkey-ci.yml +++ b/.github/workflows/monkey-ci.yml @@ -88,21 +88,21 @@ jobs: key: ${{ runner.os }}-${{ env.NODE_VERSION }}-build-${{ env.cache-name }}-${{ hashFiles('pnpm-lock.yaml') }} lookup-only: true - - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} + - if: steps.cache-pnpm.outputs.cache-hit != 'true' || contains(github.event.pull_request.labels.*.name, 'refresh-ci-cache') name: Full checkout uses: actions/checkout@v4 - - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} + - if: steps.cache-pnpm.outputs.cache-hit != 'true' || contains(github.event.pull_request.labels.*.name, 'refresh-ci-cache') name: Set up Node.js uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} + - if: steps.cache-pnpm.outputs.cache-hit != 'true' || contains(github.event.pull_request.labels.*.name, 'refresh-ci-cache') name: Install dependencies run: CI=true pnpm i --frozen-lockfile - - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} + - if: steps.cache-pnpm.outputs.cache-hit != 'true' || contains(github.event.pull_request.labels.*.name, 'refresh-ci-cache') name: Install Turbo run: npm i turbo-linux-x64 --no-save From 83a8037742d751ecf8ffe10f83f3cdd61c283581 Mon Sep 17 00:00:00 2001 From: Marlow Payne Date: Fri, 1 May 2026 22:30:48 -0700 Subject: [PATCH 4/8] ci: Don't save failure artifacts --- .github/workflows/monkey-ci.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/monkey-ci.yml b/.github/workflows/monkey-ci.yml index a3b53736ea99..7b4bbec2954e 100644 --- a/.github/workflows/monkey-ci.yml +++ b/.github/workflows/monkey-ci.yml @@ -349,21 +349,3 @@ jobs: - name: Test run: npm run test-pkg - - on-failure: - name: on-failure - runs-on: ubuntu-latest - needs: [ci-be, ci-fe, ci-assets, ci-pkg] - if: ${{ always() && contains(needs.*.result, 'failure') && github.ref != 'refs/heads/main' }} - steps: - - name: Save the PR number in an artifact - shell: bash - env: - PR_NUM: ${{ github.event.number }} - run: echo $PR_NUM > pr_num.txt - - - name: Upload the PR number - uses: actions/upload-artifact@v4 - with: - name: pr_num - path: ./pr_num.txt From c7cd926d835672a8d87766f81d50c2bf502a339c Mon Sep 17 00:00:00 2001 From: Marlow Payne Date: Fri, 1 May 2026 22:33:39 -0700 Subject: [PATCH 5/8] ci: Install Turbo via pnpm --- .github/workflows/monkey-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/monkey-ci.yml b/.github/workflows/monkey-ci.yml index 7b4bbec2954e..2ccc1ecf379f 100644 --- a/.github/workflows/monkey-ci.yml +++ b/.github/workflows/monkey-ci.yml @@ -104,7 +104,7 @@ jobs: - if: steps.cache-pnpm.outputs.cache-hit != 'true' || contains(github.event.pull_request.labels.*.name, 'refresh-ci-cache') name: Install Turbo - run: npm i turbo-linux-x64 --no-save + run: pnpm i turbo-linux-x64 --force ci-be: name: ci-be @@ -148,7 +148,7 @@ jobs: - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} name: Install Turbo - run: npm i turbo-linux-x64 --no-save + run: pnpm i turbo-linux-x64 --force - name: Check lint run: npm run lint-fast-be && npm run lint-be @@ -205,7 +205,7 @@ jobs: - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} name: Install Turbo - run: npm i turbo-linux-x64 --no-save + run: pnpm i turbo-linux-x64 --force - name: Check lint run: npm run lint-fast-fe && npm run lint-fe @@ -276,7 +276,7 @@ jobs: - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} name: Install Turbo - run: npm i turbo-linux-x64 --no-save + run: pnpm i turbo-linux-x64 --force - name: Lint styles if: steps.filter.outputs.styles == 'true' || contains(github.event.pull_request.labels.*.name, 'force-full-ci') @@ -339,7 +339,7 @@ jobs: - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} name: Install Turbo - run: npm i turbo-linux-x64 --no-save + run: pnpm i turbo-linux-x64 --force - name: Check lint run: npm run lint-fast-pkg && npm run lint-pkg From 692a69a5b6e2376af56bfd124510a8e876b7a762 Mon Sep 17 00:00:00 2001 From: Marlow Payne Date: Fri, 1 May 2026 22:37:54 -0700 Subject: [PATCH 6/8] ci: Don't force Turbo install --- .github/workflows/monkey-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/monkey-ci.yml b/.github/workflows/monkey-ci.yml index 2ccc1ecf379f..e394eb157c6c 100644 --- a/.github/workflows/monkey-ci.yml +++ b/.github/workflows/monkey-ci.yml @@ -104,7 +104,7 @@ jobs: - if: steps.cache-pnpm.outputs.cache-hit != 'true' || contains(github.event.pull_request.labels.*.name, 'refresh-ci-cache') name: Install Turbo - run: pnpm i turbo-linux-x64 --force + run: pnpm add turbo -Dw ci-be: name: ci-be @@ -148,7 +148,7 @@ jobs: - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} name: Install Turbo - run: pnpm i turbo-linux-x64 --force + run: pnpm add turbo -Dw - name: Check lint run: npm run lint-fast-be && npm run lint-be @@ -205,7 +205,7 @@ jobs: - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} name: Install Turbo - run: pnpm i turbo-linux-x64 --force + run: pnpm add turbo -Dw - name: Check lint run: npm run lint-fast-fe && npm run lint-fe @@ -276,7 +276,7 @@ jobs: - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} name: Install Turbo - run: pnpm i turbo-linux-x64 --force + run: pnpm add turbo -Dw - name: Lint styles if: steps.filter.outputs.styles == 'true' || contains(github.event.pull_request.labels.*.name, 'force-full-ci') @@ -339,7 +339,7 @@ jobs: - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} name: Install Turbo - run: pnpm i turbo-linux-x64 --force + run: pnpm add turbo -Dw - name: Check lint run: npm run lint-fast-pkg && npm run lint-pkg From 94cd10a57cf95c47c2b9571ba2c41b49bb588c1d Mon Sep 17 00:00:00 2001 From: Marlow Payne Date: Fri, 1 May 2026 23:26:19 -0700 Subject: [PATCH 7/8] ci: Revert to previous installs --- .github/workflows/monkey-ci.yml | 42 +++++++-------------------------- 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/.github/workflows/monkey-ci.yml b/.github/workflows/monkey-ci.yml index e394eb157c6c..4edbb5073168 100644 --- a/.github/workflows/monkey-ci.yml +++ b/.github/workflows/monkey-ci.yml @@ -100,11 +100,7 @@ jobs: - if: steps.cache-pnpm.outputs.cache-hit != 'true' || contains(github.event.pull_request.labels.*.name, 'refresh-ci-cache') name: Install dependencies - run: CI=true pnpm i --frozen-lockfile - - - if: steps.cache-pnpm.outputs.cache-hit != 'true' || contains(github.event.pull_request.labels.*.name, 'refresh-ci-cache') - name: Install Turbo - run: pnpm add turbo -Dw + run: CI=true pnpm install --frozen-lockfile ci-be: name: ci-be @@ -142,13 +138,8 @@ jobs: path: ${{ env.STORE_PATH }} key: ${{ runner.os }}-${{ env.NODE_VERSION }}-build-${{ env.cache-name }}-${{ hashFiles('pnpm-lock.yaml') }} - - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} - name: Install dependencies - run: CI=true pnpm i --frozen-lockfile - - - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} - name: Install Turbo - run: pnpm add turbo -Dw + - name: Install dependencies + run: CI=true pnpm install --frozen-lockfile - name: Check lint run: npm run lint-fast-be && npm run lint-be @@ -199,13 +190,8 @@ jobs: path: ${{ env.STORE_PATH }} key: ${{ runner.os }}-${{ env.NODE_VERSION }}-build-${{ env.cache-name }}-${{ hashFiles('pnpm-lock.yaml') }} - - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} - name: Install dependencies - run: CI=true pnpm i --frozen-lockfile - - - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} - name: Install Turbo - run: pnpm add turbo -Dw + - name: Install dependencies + run: CI=true pnpm install --frozen-lockfile - name: Check lint run: npm run lint-fast-fe && npm run lint-fe @@ -270,13 +256,8 @@ jobs: path: ${{ env.STORE_PATH }} key: ${{ runner.os }}-${{ env.NODE_VERSION }}-build-${{ env.cache-name }}-${{ hashFiles('pnpm-lock.yaml') }} - - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} - name: Install dependencies - run: CI=true pnpm i --frozen-lockfile - - - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} - name: Install Turbo - run: pnpm add turbo -Dw + - name: Install dependencies + run: CI=true pnpm install --frozen-lockfile - name: Lint styles if: steps.filter.outputs.styles == 'true' || contains(github.event.pull_request.labels.*.name, 'force-full-ci') @@ -333,13 +314,8 @@ jobs: path: ${{ env.STORE_PATH }} key: ${{ runner.os }}-${{ env.NODE_VERSION }}-build-${{ env.cache-name }}-${{ hashFiles('pnpm-lock.yaml') }} - - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} - name: Install dependencies - run: CI=true pnpm i --frozen-lockfile - - - if: ${{ steps.cache-pnpm.outputs.cache-hit != 'true' }} - name: Install Turbo - run: pnpm add turbo -Dw + - name: Install dependencies + run: CI=true pnpm install --frozen-lockfile - name: Check lint run: npm run lint-fast-pkg && npm run lint-pkg From 89ce3599cf5e09040d1d2cdd1b7c839037b25a4a Mon Sep 17 00:00:00 2001 From: Marlow Payne Date: Fri, 1 May 2026 23:32:45 -0700 Subject: [PATCH 8/8] style: Fix style lints --- frontend/static/themes/rainbow_trail.css | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/frontend/static/themes/rainbow_trail.css b/frontend/static/themes/rainbow_trail.css index 88077b8c767f..2a8520335338 100644 --- a/frontend/static/themes/rainbow_trail.css +++ b/frontend/static/themes/rainbow_trail.css @@ -42,12 +42,7 @@ footer button:hover > .relative > i, #restartTestButtonWithSameWordset:hover > i, #nextTestButton:hover > i, #practiseWordsButton:hover > i, -#watchReplayButton:hover > i, -footer a:hover, -footer a:hover > i, -footer button:hover, -footer button:hover > i, -footer button:hover > .relative > i { +#watchReplayButton:hover > i { background: linear-gradient( 90deg, #60b6ce,