Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ defaults: &defaults
JVM_OPTS: -Xmx3200m

orbs:
browser-tools: circleci/browser-tools@1.3.0
browser-tools: circleci/browser-tools@2.3.2

executors:
clojure:
docker:
- image: cimg/clojure:1.11.1-browsers
- image: cimg/clojure:1.11-openjdk-21.0-browsers
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we jump to 1.12 series already?

db:
docker:
- image: cimg/clojure:1.11.1-browsers
- image: cimg/clojure:1.11-openjdk-21.0-browsers
- image: postgres:13
environment:
POSTGRES_HOST_AUTH_METHOD: trust
Expand Down Expand Up @@ -54,8 +54,8 @@ jobs:
unit-test:
executor: clojure
steps:
- browser-tools/install-chrome
- browser-tools/install-chromedriver
- browser-tools/install_chrome
- browser-tools/install_chromedriver
- checkout
- attach_workspace:
at: .
Expand Down Expand Up @@ -92,8 +92,8 @@ jobs:
resource_class: large
parallelism: 4
steps:
- browser-tools/install-chrome
- browser-tools/install-chromedriver
- browser-tools/install_chrome
- browser-tools/install_chromedriver
- checkout
# include shadow-cljs build
- attach_workspace:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Changes since v2.38.1
- Attachment upload error is indicated by small icon next to the upload button (detailed error is still shown in top of the page).
- Pending attachment upload is indicated by spinner next to the upload button.
- Edit buttons on the administration detail pages are hidden when the user is not permitted to edit, like they are hidden on the list pages already (#2814)
- Update the Docker image and CircleCI build image to latest available Java version (25 and 21, respectively). (#3395)

### Fixes
- Resolved issue where workflow voting could not be removed, which caused UI to display raw translation keys due to nil voting values. (#3357)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# For documentation see docs/installing-upgrading.md

FROM eclipse-temurin:17-jre-alpine
FROM eclipse-temurin:25-jre-alpine
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also help with #3416.


RUN apk add --no-cache bash

Expand Down
4 changes: 2 additions & 2 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
In order to get started with REMS, you need to have the following software installed:

- Docker
- Java. Currently REMS should be working with Java versions 11 to 17
- Leiningen. As of 2022-06-01, the project should work with lein version Leiningen 2.9.8 on Java 17 OpenJDK 64-Bit Server VM.
- Java. Currently REMS should be working with Java versions 11 to 25
- Leiningen. As of 2026-01-08, the project should work with lein version Leiningen 2.12.0 on Java 25 OpenJDK 64-Bit Server VM.
- npm and npx

### Mac OS installation for Apple M1 Chip (Apple Silicon M1)
Expand Down
3 changes: 3 additions & 0 deletions test/clj/rems/test_browser.clj
Original file line number Diff line number Diff line change
Expand Up @@ -2864,18 +2864,21 @@
(fill-localized-title! "Multiselect (%s)"))
(testing "create three options"
(btu/scroll-and-click (field-component :add-option))
(is (btu/eventually-visible? (field-component :options-0-key)))
(btu/fill-human (field-component :options-0-key) "x")
(btu/fill-human (field-component :options-0-label-en) "X")
(btu/fill-human (field-component :options-0-label-fi) "X")
(btu/fill-human (field-component :options-0-label-sv) "X")

(btu/scroll-and-click (field-component :add-option))
(is (btu/eventually-visible? (field-component :options-1-key)))
(btu/fill-human (field-component :options-1-key) "y")
(btu/fill-human (field-component :options-1-label-en) "Y")
(btu/fill-human (field-component :options-1-label-fi) "Y")
(btu/fill-human (field-component :options-1-label-sv) "Y")

(btu/scroll-and-click (field-component :add-option))
(is (btu/eventually-visible? (field-component :options-2-key)))
(btu/fill-human (field-component :options-2-key) "z")
(btu/fill-human (field-component :options-2-label-en) "Z")
(btu/fill-human (field-component :options-2-label-fi) "Z")
Expand Down