Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency gradle to v8.8 #171

Closed
wants to merge 9 commits into from
Closed
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
12 changes: 12 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ jobs:
- gradle-
- run:
command: make dev-up lint test-coverage
- run:
name: Store container logs
command: make save-logs OUTPUT_LOGS_DIR=~/docker-logs
when: on_fail
- save_cache:
paths:
- ~/.gradle
Expand All @@ -44,6 +48,8 @@ jobs:
destination: kover
- store_artifacts:
path: build/reports/detekt/detekt.html
- store_artifacts:
path: ~/docker-logs

e2e_test:
machine:
Expand Down Expand Up @@ -86,12 +92,18 @@ jobs:
command: |
cd e2e-test-ui
make e2e-ci
- run:
name: Store container logs
command: make save-logs OUTPUT_LOGS_DIR=~/docker-logs
when: on_fail
- store_test_results:
path: e2e-test-ui/test_results
- store_artifacts:
path: e2e-test-ui/cypress/videos
- store_artifacts:
path: e2e-test-ui/cypress/screenshots
- store_artifacts:
path: ~/docker-logs

workflows:
version: 2
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:8.6.0-jdk21 AS builder
FROM gradle:8.8-jdk21 AS builder

FROM eclipse-temurin:21.0.2_13-jre AS runtime

Expand Down
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,10 @@ clean: ## Stops and removes all project containers. Deletes local build/cache di

update: ## Downloads the latest versions of containers.
docker compose pull

save-logs: ## Saves docker container logs in a directory defined by OUTPUT_LOGS_DIR=
mkdir -p ${OUTPUT_LOGS_DIR}
docker logs ${PROJECT_NAME}-api-1 > ${OUTPUT_LOGS_DIR}/api.log
docker logs ${PROJECT_NAME}-ui-1 > ${OUTPUT_LOGS_DIR}/ui.log
docker logs ${PROJECT_NAME}-arns-handover-1 > ${OUTPUT_LOGS_DIR}/arns-handover.log
docker logs ${PROJECT_NAME}-hmpps-auth-1 > ${OUTPUT_LOGS_DIR}/hmpps-auth.log
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ services:
depends_on:
- redis
- hmpps-auth
- arns-handover
healthcheck:
test: [ "CMD", "curl", "-f", "http://ui:3000/health" ]
interval: 5s
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down