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 Oct 2, 2023
1 parent 3494825 commit 5ebabae
Show file tree
Hide file tree
Showing 4 changed files with 2,004 additions and 3,785 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ env:

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

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

- name: Build image
run: DOCKER_BUILDKIT=1 docker build --tag jaas-ai .
Expand All @@ -20,10 +20,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@v2
- uses: actions/checkout@v4

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

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

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

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

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

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

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

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

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

- name: Install requirements
run: |
Expand All @@ -92,29 +92,29 @@ jobs:
flags: python

check-build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install dependencies
run: yarn

- name: Check the project builds
run: yarn run build

check-prettier:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Install dependencies
run: yarn
- name: Run tests
run: yarn run check-prettier

js-lint:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Install dependencies
run: yarn
Expand All @@ -123,10 +123,10 @@ jobs:
run: yarn run lint-js

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

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

- name: Install dependencies
run: yarn install --immutable
Expand All @@ -140,11 +140,11 @@ jobs:
flags: javascript

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

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

- name: Check inclusive naming
uses: canonical-web-and-design/inclusive-naming@main
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# 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 pip3 config set global.disable-pip-version-check true
Expand All @@ -11,15 +11,15 @@ RUN --mount=type=cache,target=/root/.cache/pip pip3 install --user --requirement

# Build stage: Install yarn dependencies
# ===
FROM node:16 AS yarn-dependencies
FROM node:20 AS yarn-dependencies
WORKDIR /srv
ADD package.json .
RUN --mount=type=cache,target=/usr/local/share/.cache/yarn yarn install --production


# Build stage: Build dashboard
# ===
FROM ubuntu:focal AS build-dashboard
FROM ubuntu:jammy AS build-dashboard
WORKDIR /srv/build
# extract the dashboard archive
ADD *.tar.bz2 .
Expand All @@ -44,7 +44,7 @@ RUN yarn run build-css

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

# Python dependencies
ENV LANG C.UTF-8
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,32 @@
"@canonical/cookie-policy": "3.4.0",
"@canonical/global-nav": "2.7.0",
"@canonical/latest-news": "1.4.1",
"@sentry/browser": "5.30.0",
"@sentry/browser": "7.73.0",
"autoprefixer": "10.4.13",
"babel-loader": "8.3.0",
"babel-loader": "9.1.3",
"braces": "3.0.2",
"concurrently": "5.3.0",
"concurrently": "8.2.1",
"instant.page": "5.1.1",
"postcss": "8.4.21",
"postcss-cli": "8.3.1",
"postcss-cli": "10.1.0",
"sass": "1.57.1",
"vanilla-framework": "2.37.1",
"watch-cli": "0.2.3",
"webpack": "5.75.0",
"webpack-cli": "4.10.0",
"webpack-cli": "5.1.4",
"terser-webpack-plugin": "5.3.6"
},
"devDependencies": {
"eslint": "7.32.0",
"eslint-config-airbnb-base": "14.2.1",
"eslint-config-prettier": "7.2.0",
"eslint": "8.50.0",
"eslint-config-airbnb-base": "15.0.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-import": "2.27.5",
"jest": "26.6.3",
"prettier": "2.8.3",
"stylelint": "13.13.1",
"stylelint-config-prettier": "8.0.2",
"stylelint-config-standard": "20.0.0",
"stylelint-order": "4.1.0"
"jest": "29.7.0",
"prettier": "3.0.3",
"stylelint": "15.10.3",
"stylelint-config-prettier": "9.0.5",
"stylelint-config-standard": "34.0.0",
"stylelint-order": "6.0.3"
},
"resolutions": {
"lodash": "^4.17.15",
Expand Down
Loading

0 comments on commit 5ebabae

Please sign in to comment.