diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index f79823f0..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,253 +0,0 @@ -# Use the latest 2.1 version of CircleCI pipeline process engine. -# See: https://circleci.com/docs/2.0/configuration-reference -version: 2.1 - -# Define a job to be invoked later in a workflow. -# See: https://circleci.com/docs/2.0/configuration-reference/#jobs -jobs: - api-tests: - docker: - - image: cimg/python:3.13 - # `large` (4 vCPU, 8 GB) so pytest-xdist's `-nauto` has room to scale. - resource_class: large - steps: - - checkout - - run: sudo apt-get update - - run: sudo apt-get install -y ffmpeg catdoc - - restore_cache: - key: deps-3.13-{{ checksum "requirements.txt" }}-6 - - run: - name: Install Requirements - command: | - # A restored venv points at the exact interpreter that built it. CircleCI's - # cimg/python:3.13 gets patch bumps, and this cache key does not name the - # patch, so a venv cached before a bump has a dangling bin/python3 -- and - # `python3 -m venv` over it fails with `[Errno 2]` instead of repairing it, - # which broke every Python job. Rebuild when it cannot run: that costs a - # reinstall only on the first run after a bump. - if ! ./venv/bin/python3 --version >/dev/null 2>&1; then rm -rf venv; fi - python3 -m venv venv - . venv/bin/activate - pip install -r requirements.txt - - save_cache: - key: deps-3.13-{{ checksum "requirements.txt" }}-6 - paths: - - "venv" - # `-nauto` parallelizes across all available cores via pytest-xdist. - # `-svv` was dumping the full test stdout to CircleCI logs on every run, - # which inflated wall time and produced multi-MB log artifacts; dropped. - - run: - command: './venv/bin/pytest -nauto --junitxml=test-results.xml' - - store_test_results: - path: test-results.xml - # Do the API and the frontend's test fixtures still agree? - # - # `api-tests` runs these too, as part of the whole suite. This job exists for the - # signal: fixture drift is silent by nature -- the frontend suite passes against a body the - # API stopped sending -- so it is worth a check whose name says what broke, failing in under a - # minute rather than somewhere inside seventeen hundred results. - # - # It needs no ffmpeg or catdoc (verified), and shares the dependency cache key with the other - # Python jobs, so it costs a venv restore and one test file. - api-contract-tests: - docker: - - image: cimg/python:3.13 - resource_class: medium - steps: - - checkout - - restore_cache: - key: deps-3.13-{{ checksum "requirements.txt" }}-6 - - run: - name: Install Requirements - command: | - # A restored venv points at the exact interpreter that built it. CircleCI's - # cimg/python:3.13 gets patch bumps, and this cache key does not name the - # patch, so a venv cached before a bump has a dangling bin/python3 -- and - # `python3 -m venv` over it fails with `[Errno 2]` instead of repairing it, - # which broke every Python job. Rebuild when it cannot run: that costs a - # reinstall only on the first run after a bump. - if ! ./venv/bin/python3 --version >/dev/null 2>&1; then rm -rf venv; fi - python3 -m venv venv - . venv/bin/activate - pip install -r requirements.txt - - run: - name: Fixtures match the OpenAPI spec, and the spec matches the handlers - command: './venv/bin/pytest wrolpi/test/test_api_fixtures.py -v' - - api-alembic-migrations: - docker: - - image: cimg/python:3.13 - resource_class: medium - steps: - - checkout - - restore_cache: - key: deps-3.13-{{ checksum "requirements.txt" }}-6 - - run: - name: Install Requirements - command: | - # A restored venv points at the exact interpreter that built it. CircleCI's - # cimg/python:3.13 gets patch bumps, and this cache key does not name the - # patch, so a venv cached before a bump has a dangling bin/python3 -- and - # `python3 -m venv` over it fails with `[Errno 2]` instead of repairing it, - # which broke every Python job. Rebuild when it cannot run: that costs a - # reinstall only on the first run after a bump. - if ! ./venv/bin/python3 --version >/dev/null 2>&1; then rm -rf venv; fi - python3 -m venv venv - . venv/bin/activate - pip install -r requirements.txt - - run: - name: Create Media Directory - command: mkdir -p /tmp/wrolpi-media/config - - run: - name: Run Alembic Migrations - command: MEDIA_DIRECTORY=/tmp/wrolpi-media ./venv/bin/python ./main.py db upgrade - - run: - name: Check for Missing Migrations - command: MEDIA_DIRECTORY=/tmp/wrolpi-media ./venv/bin/python ./main.py db check - sanic-api-start: - docker: - - image: cimg/python:3.13 - steps: - - checkout - - restore_cache: - key: deps-3.13-{{ checksum "requirements.txt" }}-6 - - run: - name: Install dependencies - command: | - # A restored venv points at the exact interpreter that built it. CircleCI's - # cimg/python:3.13 gets patch bumps, and this cache key does not name the - # patch, so a venv cached before a bump has a dangling bin/python3 -- and - # `python3 -m venv` over it fails with `[Errno 2]` instead of repairing it, - # which broke every Python job. Rebuild when it cannot run: that costs a - # reinstall only on the first run after a bump. - if ! ./venv/bin/python3 --version >/dev/null 2>&1; then rm -rf venv; fi - python -m venv venv - . venv/bin/activate - pip install -r requirements.txt - sudo mkdir -p /media/wrolpi - - run: - name: Start Sanic API - command: | - . venv/bin/activate - sanic main:api_app -H 0.0.0.0 -p 8081 - background: true - - run: - name: Test Sanic API - command: | - sleep 20 - curl http://0.0.0.0:8081/api/echo - - run: - name: Stop Sanic API - command: pkill -f sanic - react-app-start: - docker: - - image: cimg/node:20.19 - resource_class: large - steps: - - checkout - - restore_cache: - key: app-{{ checksum "app/package-lock.json" }} - - run: cd app && npm install - - save_cache: - key: app-{{ checksum "app/package-lock.json" }} - paths: - - ./app/node_modules - - run: - name: Build React App - command: cd app && DISABLE_ESLINT_PLUGIN=true npm run build - - run: - name: Start React App - command: cd app && DISABLE_ESLINT_PLUGIN=true npm run start - background: true - - run: - name: Test React App - command: | - sleep 20 - curl http://0.0.0.0:3000/manifest.json - - run: - name: Stop React App - command: pkill -f npm - # Jest tests moved to GitHub Actions (.github/workflows/jest-tests.yml) - # Component specs live under `src/`, so they need `cypress run --component`; the e2e job's - # `cypress run` will not match them. Cypress starts its own dev server, so no `npm start`. - cypress-component-tests: - docker: - - image: cimg/node:20.19-browsers - resource_class: large - steps: - - checkout - - restore_cache: - key: app-browsers-{{ checksum "app/package-lock.json" }} - - run: - name: Install Dependencies - command: cd app && npm install - - run: - name: Install Cypress Binary - command: cd app && npx cypress install - - run: - name: Run Cypress Component Tests - command: cd app && CI=true npx cypress run --component - - store_artifacts: - path: app/cypress/screenshots - cypress-e2e-tests: - docker: - - image: cimg/node:20.19-browsers - resource_class: large - steps: - - checkout - - restore_cache: - key: app-browsers-{{ checksum "app/package-lock.json" }} - - run: - name: Install Dependencies - command: cd app && npm install - # The Cypress binary lives outside node_modules, so caching only - # node_modules lets the two drift apart: a restored cache satisfies npm, - # npm skips the postinstall download, and the binary for the new version - # is never fetched. Cache both, and install explicitly (a no-op when the - # binary is already present). - - run: - name: Install Cypress Binary - command: cd app && npx cypress install - - save_cache: - key: app-browsers-{{ checksum "app/package-lock.json" }} - paths: - - ./app/node_modules - - ~/.cache/Cypress - - run: - name: Start React App in Background - command: cd app && DISABLE_ESLINT_PLUGIN=true npm start - background: true - - run: - name: Wait for React App - command: | - for i in {1..60}; do - if curl -s http://localhost:3000 > /dev/null; then - echo "React app is ready!" - exit 0 - fi - echo "Waiting for React app... ($i/60)" - sleep 2 - done - echo "React app failed to start" - exit 1 - - run: - name: Run Cypress Tests - command: cd app && CI=true npx cypress run - - store_artifacts: - path: app/cypress/videos - - store_artifacts: - path: app/cypress/screenshots - -workflows: - wrolpi-api-tests: - jobs: - - sanic-api-start - - api-tests - - api-contract-tests - - api-alembic-migrations - wrolpi-app-test: - jobs: - - react-app-start - # jest-tests moved to GitHub Actions - - cypress-e2e-tests - - cypress-component-tests diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 6fddd0e0..efb01e97 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -56,8 +56,7 @@ jobs: path: app/cypress/screenshots retention-days: 14 - # Waiting for `npm start` to serve the app also covers the dev server starting, which - # CircleCI checked in a separate job. + # Waiting for `npm start` to serve the app also checks that the dev server starts. cypress-e2e-tests: runs-on: ubuntu-latest diff --git a/README.md b/README.md index dfe580fd..4e8af40b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # WROLPi -[![Build Status](https://img.shields.io/circleci/build/github/lrnselfreliance/wrolpi/release?label=release%20build)](https://app.circleci.com/pipelines/github/lrnselfreliance/wrolpi?branch=release&filter=all) +[![Backend Tests](https://github.com/lrnselfreliance/wrolpi/actions/workflows/backend.yml/badge.svg?branch=master)](https://github.com/lrnselfreliance/wrolpi/actions/workflows/backend.yml?query=branch%3Amaster) [![License: GPL v3](https://img.shields.io/github/license/lrnselfreliance/wrolpi?style=flat-square)](https://github.com/lrnselfreliance/wrolpi/blob/master/LICENSE) [![Discord](https://img.shields.io/discord/900430987987681330?label=Discord&logo=discord)](https://discord.gg/HrwFk7nqA2) [![Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/lrnselfreliance/wrolpi) diff --git a/app/cypress/support/component.js b/app/cypress/support/component.js index e6d426e8..fc66e133 100644 --- a/app/cypress/support/component.js +++ b/app/cypress/support/component.js @@ -41,7 +41,7 @@ import React from "react"; Cypress.on('uncaught:exception', (err, runnable) => { if (err.message.includes('ChunkLoadError')) { - return false; // Ignore this error which happens after CircleCI tests. + return false; // Ignore this error which happens after CI tests. } // Otherwise, fail like normal return true; diff --git a/app/src/components/Channels.cy.js b/app/src/components/Channels.cy.js index 34fc5994..15be46a9 100644 --- a/app/src/components/Channels.cy.js +++ b/app/src/components/Channels.cy.js @@ -49,7 +49,7 @@ describe('Channels Page', () => { {initialEntries: ['/videos/channel/1/edit']} ); cy.wait('@channelFetch'); - cy.wait('@searchDirectories'); // Needed for CircleCi. + cy.wait('@searchDirectories'); // Needed in CI. cy.wait(500); cy.get('input[name="name"]').should('be.visible'); cy.get('input[name="name"]').should('have.value', 'Editing Channel'); diff --git a/pytest.ini b/pytest.ini index 0d92b830..3d51a24a 100644 --- a/pytest.ini +++ b/pytest.ini @@ -11,13 +11,13 @@ markers = # This is a hang detector, not a performance budget. It was 30s, but the plugin was never # declared in requirements.txt, so CI installed without it and the limit had never actually been # applied there. The first run that enforced it failed sixteen tests, every one of them at -# 30.0s and none of them hung: CircleCI's 4 vCPU box runs this suite in roughly twice the +# 30.0s and none of them hung: a 4 vCPU CI runner runs this suite in roughly twice the # wall-clock of a dev machine, and a cluster of refresh/worker tests sits at 28-30s there -- # test_get_refresh_progress passed at 29.9s and test_create_playlist at 29.8s, which is luck # rather than headroom. # # 120s is about four times the slowest legitimate test observed on CI, so it still catches a -# genuine hang long before CircleCI kills the job, while leaving slow-but-working tests alone. +# genuine hang long before the CI job times out, while leaving slow-but-working tests alone. # Raise it if CI grows slower; a named timeout failure is the point, and a limit tight enough to # fire on healthy tests just trades one unreliable signal for another. timeout = 120