Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: cat Aptfile | sudo xargs apt-get install

- name: Install uv
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
with:
enable-cache: true

Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
UNSUBSCRIBE_SECRET_KEY: fake_unsubscribe_secret

- name: Upload coverage to CodeCov
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
with:
file: ./coverage.xml

Expand All @@ -110,7 +110,7 @@ jobs:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
with:
node-version: "^24.0.0"
cache: yarn
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:

- name: Get number of CPU cores
id: cpu-cores
uses: SimenB/github-actions-cpu-cores@97ba232459a8e02ff6121db9362b09661c875ab8 # v2
uses: SimenB/github-actions-cpu-cores@97330871fe1b7d3529392ea000e3d2c4b357e403 # v3

- name: Tests
run: yarn test --max-workers ${STEPS_CPU_CORES_OUTPUTS_COUNT}
Expand All @@ -149,7 +149,7 @@ jobs:
STEPS_CPU_CORES_OUTPUTS_COUNT: ${{ steps.cpu-cores.outputs.count }}

- name: Upload coverage to CodeCov
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
with:
file: coverage/lcov.info

Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
with:
persist-credentials: false

- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
with:
node-version: "^24.0.0"
cache: yarn
Expand All @@ -204,7 +204,7 @@ jobs:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
with:
node-version: "^24.0.0"
cache: yarn
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
with:
node-version: "^24.0.0"
cache: yarn
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
persist-credentials: false

- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
with:
node-version: "^24.0.0"
cache: yarn
Expand All @@ -33,7 +33,7 @@ jobs:
run: yarn workspace ol-components build-storybook

- name: Upload artifact
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4
uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5
with:
path: ./frontends/ol-components/storybook-static

Expand Down
5 changes: 5 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,8 @@ supportedArchitectures:
- current
- glibc
enableScripts: false

# Worker-thread zip conversion holds one libzip WASM heap per CPU; with supportedArchitectures
# fetching x64+arm64 native tarballs this exceeds the 3GB Mend Renovate runner (as in
# mitodl/learn-ai#40). Off-heap memory, so NODE_OPTIONS can't cap it.
taskPoolMode: async
13 changes: 7 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@ LABEL maintainer="ODL DevOps <mitx-devops@mit.edu>"

# App-specific apt extras; common-core packages are in mitodl/ol-python-base:3.12.
# BuildKit cache mounts keep downloaded packages out of the final image layer.
# chromium/chromium-driver come from trixie. They
# used to need a Debian sid source because trixie lagged; it no longer does,
# and pulling from sid dragged in a glibc upgrade that conflicts with the
# hardened base image.
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked \
apt-get update && \
apt-get install -y --no-install-recommends \
libcairo2-dev \
poppler-utils \
default-jre && \
echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list && \
apt-get update -qqy && \
apt-get install -qqy --no-install-recommends \
-o Dpkg::Options::="--force-confnew" \
chromium chromium-driver
default-jre \
chromium \
chromium-driver

FROM base AS deps

Expand Down
14 changes: 14 additions & 0 deletions RELEASE.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
Release Notes
=============

Version 0.79.0
--------------

- Skip a podcast feed with an unparseable episode instead of aborting the run (#3892)
- Update actions/setup-node action to v7 (#3898)
- Run yarn zip conversion single-threaded to avoid Renovate OOM (#3904)
- fix(docker): install chromium from trixie instead of Debian sid (#3905)
- Migrate off the legacy MUI Grid API (prerequisite for #2770) (#3867)
- Rename department 21M from Music and Theater Arts to Music (#3669)
- Update actions/upload-pages-artifact action to v5 (#3899)
- Update astral-sh/setup-uv action to v10 (#3900)
- Update codecov/codecov-action action to v7 (#3901)
- Update SimenB/github-actions-cpu-cores action to v3 (#3902)

Version 0.78.6
--------------

Expand Down
2 changes: 1 addition & 1 deletion data_fixtures/fixtures/departments.json
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
"model": "learning_resources.LearningResourceDepartment",
"fields": {
"department_id": "21M",
"name": "Music and Theater Arts",
"name": "Music",
"school_id": 3,
"created_on": "2024-04-17T00:00:00.000000+00:00",
"updated_on": "2024-04-17T00:00:00.000000+00:00"
Expand Down
47 changes: 47 additions & 0 deletions data_fixtures/migrations/0026_rename_department_21M_to_music.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Data migration: rename department 21M from "Music and Theater Arts" to "Music"

from django.db import migrations
from django.utils.text import slugify

OLD_NAME = "Music and Theater Arts"
NEW_NAME = "Music"


def _rename(apps, name):
LearningResourceDepartment = apps.get_model(
"learning_resources", "LearningResourceDepartment"
)
Channel = apps.get_model("channels", "Channel")

department = LearningResourceDepartment.objects.filter(department_id="21M").first()
if not department:
return
department.name = name
department.save()

channel = Channel.objects.filter(department_detail__department=department).first()
if channel:
channel.title = name
channel.name = slugify(name)
channel.save()


def rename_to_music(apps, schema_editor):
_rename(apps, NEW_NAME)


def rename_to_music_and_theater_arts(apps, schema_editor):
_rename(apps, OLD_NAME)


class Migration(migrations.Migration):
dependencies = [
(
"data_fixtures",
"0025_add_department_21T",
),
]

operations = [
migrations.RunPython(rename_to_music, rename_to_music_and_theater_arts),
]
6 changes: 3 additions & 3 deletions frontends/api/src/generated/v0/api.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading