Skip to content

Commit e41961d

Browse files
authored
Merge pull request #1434 from ral-facilities/release/v3.0.1
Release/v3.0.1
2 parents cbfa974 + f18d4c5 commit e41961d

File tree

6 files changed

+128
-117
lines changed

6 files changed

+128
-117
lines changed

.github/workflows/ci-build.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ jobs:
2020
node-version: 20
2121
cache: 'yarn'
2222
- name: Install dependencies
23-
# Ubuntu 16+ does not install libgconf-2-4 by default, so we need to install it ourselves (for Cypress)
24-
run: |
25-
sudo apt-get install libgconf-2-4
26-
yarn --immutable
23+
run: yarn --immutable
2724
- name: Run linting
2825
run: yarn lint:js
2926
- name: Run unit tests
@@ -41,7 +38,7 @@ jobs:
4138
# This job triggers only if all the other jobs succeed. It builds the Docker image to ensure it builds correctly.
4239
needs: [test]
4340
name: Docker
44-
runs-on: ubuntu-20.04
41+
runs-on: ubuntu-24.04
4542
steps:
4643
- name: Checkout repo
4744
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/release-build.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ jobs:
2323
cache: 'yarn'
2424

2525
- name: Install dependencies
26-
# Ubuntu 16+ does not install libgconf-2-4 by default, so we need to install it ourselves (for Cypress)
27-
run: |
28-
sudo apt-get install libgconf-2-4
29-
yarn --immutable
26+
run: yarn --immutable
3027

3128
- name: Build
3229
run: yarn build

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# Changelog
22

3+
## [v3.0.1](https://github.com/ral-facilities/scigateway/tree/v3.0.1) (2025-03-14)
4+
5+
## What's Changed
6+
7+
### Features
8+
* Remove libgconf install step on CI jobs by @louise-davies in https://github.com/ral-facilities/scigateway/pull/1426
9+
### Dependencies
10+
* Bump nanoid from 3.3.4 to 3.3.8 by @dependabot in https://github.com/ral-facilities/scigateway/pull/1425
11+
* Update dependency ubuntu to v24 by @renovate in https://github.com/ral-facilities/scigateway/pull/1427
12+
* Update dependency axios to v1.8.2 [SECURITY] by @renovate in https://github.com/ral-facilities/scigateway/pull/1429
13+
* Bump @babel/runtime from 7.23.9 to 7.26.10 by @dependabot in https://github.com/ral-facilities/scigateway/pull/1433
14+
* Bump @babel/helpers from 7.20.1 to 7.26.10 by @dependabot in https://github.com/ral-facilities/scigateway/pull/1432
15+
* Update node to 20.18.3-alpine3.21 and httpd to 2.4.63-alpine3.21 in docker images by @joelvdavies in https://github.com/ral-facilities/scigateway/pull/1431
16+
* Bump axios from 1.7.4 to 1.8.2 by @dependabot in https://github.com/ral-facilities/scigateway/pull/1428
17+
* Bump @babel/runtime-corejs3 from 7.20.1 to 7.26.10 by @dependabot in https://github.com/ral-facilities/scigateway/pull/1430
18+
19+
**Full Changelog**: https://github.com/ral-facilities/scigateway/compare/v3.0.0...v3.0.1
20+
321
## [v3.0.0](https://github.com/ral-facilities/scigateway/tree/v3.0.0) (2024-11-27)
422

523
## What's Changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Dockerfile to build and serve scigateway
22

33
# Build stage
4-
FROM node:20.17.0-alpine3.20@sha256:2d07db07a2df6830718ae2a47db6fedce6745f5bcd174c398f2acdda90a11c03 as builder
4+
FROM node:20.18.3-alpine3.21@sha256:053c1d99e608fe9fa0db6821edd84276277c0a663cd181f4a3e59ee20f5f07ea as builder
55

66
WORKDIR /scigateway-build
77

@@ -24,7 +24,7 @@ COPY docker/settings.json public/settings.json
2424
RUN yarn build
2525

2626
# Run stage
27-
FROM httpd:2.4.62-alpine3.20@sha256:66c49302c02430619abb84240a438bcfc083015661009fcaaeaac931450f62cd
27+
FROM httpd:2.4.63-alpine3.21@sha256:4aec2953509e2d3aa5a8d73c580a381be44803fd2481875b15d9ad7d2810d7ca
2828

2929
WORKDIR /usr/local/apache2/htdocs
3030

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "scigateway",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"private": true,
55
"resolutions": {
66
"@types/react": "18.0.33",
@@ -20,7 +20,7 @@
2020
"@types/react-redux-toastr": "7.6.2",
2121
"@types/react-router-dom": "5.3.3",
2222
"@types/redux-logger": "3.0.8",
23-
"axios": "1.7.4",
23+
"axios": "1.8.3",
2424
"connected-react-router": "6.9.3",
2525
"cookie-parser": "1.4.5",
2626
"custom-event-polyfill": "1.0.7",

0 commit comments

Comments
 (0)