Skip to content

Commit

Permalink
Update all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored Jan 17, 2024
1 parent d5134a2 commit 73921e2
Show file tree
Hide file tree
Showing 5 changed files with 521 additions and 529 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ env:

jobs:
run-image:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build image
run: DOCKER_BUILDKIT=1 docker build --tag canonical-com .
Expand All @@ -22,10 +22,10 @@ jobs:
curl --head --fail --retry-delay 1 --retry 30 --retry-connrefused http://localhost
run-dotrun:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install dotrun
uses: canonical/install-dotrun@main
Expand All @@ -40,10 +40,10 @@ jobs:
run: /snap/bin/dotrun & curl --head --fail --retry-delay 1 --retry 30 --retry-connrefused http://localhost:8002

lint-scss:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install dependencies
run: yarn install --immutable
Expand All @@ -52,10 +52,10 @@ jobs:
run: yarn lint-scss

lint-python:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install node dependencies
run: yarn install --immutable
Expand All @@ -69,10 +69,10 @@ jobs:
run: yarn lint-python

test-python:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install requirements
run: |
Expand All @@ -94,10 +94,10 @@ jobs:
bash <(curl -s https://codecov.io/bash) -cF python
test-javascript:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install dependencies
run: yarn install --immutable
Expand All @@ -106,11 +106,11 @@ jobs:
run: yarn test-js

inclusive-naming-check:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: woke
uses: canonical-web-and-design/inclusive-naming@main
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

# Build stage: Install python dependencies
# ===
FROM ubuntu:focal AS python-dependencies
FROM ubuntu:jammy AS python-dependencies
RUN apt-get update && apt-get install --no-install-recommends --yes python3-pip python3-setuptools
ADD requirements.txt /tmp/requirements.txt
RUN --mount=type=cache,target=/root/.cache/pip pip3 install --user --requirement /tmp/requirements.txt


# Build stage: Install yarn dependencies
# ===
FROM node:18 AS yarn-dependencies
FROM node:21 AS yarn-dependencies
WORKDIR /srv
ADD package.json .
RUN --mount=type=cache,target=/usr/local/share/.cache/yarn yarn install --production
Expand All @@ -31,7 +31,7 @@ RUN yarn run build-css

# Build the production image
# ===
FROM ubuntu:focal
FROM ubuntu:jammy

# Install python and import python dependencies
RUN apt-get update && apt-get install --no-install-recommends --yes python3-setuptools python3-lib2to3 python3-pkg-resources ca-certificates libsodium-dev
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,33 @@
"@canonical/cookie-policy": "3.5.0",
"@canonical/latest-news": "1.4.1",
"@canonical/global-nav": "3.6.1",
"@testing-library/cypress": "9.0.0",
"@testing-library/cypress": "10.0.1",
"autoprefixer": "10.4.13",
"concurrently": "7.6.0",
"concurrently": "8.2.2",
"esbuild": "0.14.10",
"fuse.js": "^6.6.2",
"fuse.js": "^7.0.0",
"postcss": "8.4.31",
"postcss-cli": "10.1.0",
"postcss-cli": "11.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sass": "1.57.1",
"vanilla-framework": "4.5.0"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^14.0.0",
"@types/jest": "^29.4.0",
"concurrently": "6.5.1",
"cypress": "12.3.0",
"concurrently": "8.2.2",
"cypress": "13.6.3",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"prettier": "2.8.7",
"stylelint": "14.16.1",
"prettier": "3.2.4",
"stylelint": "16.1.0",
"stylelint-config-prettier": "9.0.4",
"stylelint-config-standard-scss": "6.1.0",
"stylelint-config-standard-scss": "13.0.0",
"stylelint-order": "6.0.1",
"ts-jest": "^29.0.5",
"typescript": "^4.9.5",
"typescript": "^5.0.0",
"watch-cli": "0.2.3"
},
"jest": {
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ canonicalwebteam.image-template==1.3.1
canonicalwebteam.templatefinder==1.0.0
canonicalwebteam.discourse==5.4.4
canonicalwebteam.search==1.3.0
bleach==5.0.1
bleach==6.1.0
markdown==3.4.1
python-slugify==7.0.0
python-slugify==8.0.1
vcrpy-unittest==0.1.7
cryptography==36.0.2
gql==2.0.0
gql==3.5.0
Loading

0 comments on commit 73921e2

Please sign in to comment.