Skip to content

Commit

Permalink
Release 152
Browse files Browse the repository at this point in the history
  • Loading branch information
mec committed Nov 27, 2024
2 parents 50c0be2 + 437e460 commit 4b37577
Show file tree
Hide file tree
Showing 13 changed files with 44 additions and 57 deletions.
23 changes: 0 additions & 23 deletions .github/workflows/ci.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ci_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
name: Run Rspec and Simplecov
run: |
docker compose -p app_test -f docker-compose.ci.yml \
run --name app_test test /bin/bash -c "bin/rspec --format=documentation"
run --name app_test test /bin/bash -c "bin/rails spec"
-
name: Copy coverage report from container
run: mkdir coverage && docker cp app_test:/app/coverage/lcov.info coverage/lcov.info
Expand Down
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
--require spec_helper
--require rails_helper
--format documentation
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@

[Full changelog][unreleased]

## Release 152 - 2024-11-27

[Full changelog][152]

- Update Redis and Sidekiq

## Release 151 - 2024-11-26

[Full changelog][151]
Expand Down Expand Up @@ -1707,7 +1713,8 @@
- Planned start and end dates are mandatory
- Actual start and end dates must not be in the future

[unreleased]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-151...HEAD
[unreleased]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-152...HEAD
[152]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-151...release-152
[151]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-150...release-151
[150]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-149...release-150
[149]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-148...release-149
Expand Down
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,15 @@ COPY . ${APP_HOME}
RUN cp -R $DEPS_HOME/node_modules $APP_HOME/node_modules
RUN cp -R $DEPS_HOME/node_modules/govuk-frontend/govuk/assets $APP_HOME/app/assets

RUN \
RAILS_ENV=$RAILS_ENV \
# We need a secret key, database url and Redis url to compile assets, these are
# not used in the running application
RUN if [ ${RAILS_ENV} = "production" ]; then \
DOMAIN="stand-in.local" \
SECRET_KEY_BASE="super secret" \
DATABASE_URL="postgres://stand-in:5432" \
REDIS_URL="redis://stand-in.local:6379" \
bundle exec rake assets:precompile --quiet
bundle exec rake assets:precompile --quiet; \
fi

# create tmp/pids
RUN mkdir -p tmp/pids
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ gem "rails", "~> 6"
gem "rack-attack"
gem "rollout"
gem "rollout-ui"
gem "redis", "< 5"
gem "redis", "~> 5"
gem "redis-namespace"
gem "redis-actionpack"
gem "redis-store"
gem "sidekiq", "~> 6.5.10"
gem "sidekiq", "~> 7"
gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
gem "wicked"
gem "strip_attributes"
Expand Down
29 changes: 17 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,11 @@ GEM
railties (>= 5.0.0)
faker (3.5.1)
i18n (>= 1.8.11, < 2)
fakeredis (0.8.0)
redis (~> 4.1)
fakeredis (0.1.4)
ffi (1.17.0)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
ffi (1.17.0-x86_64-linux)
foreman (0.88.1)
globalid (1.2.1)
activesupport (>= 6.1)
Expand Down Expand Up @@ -296,6 +295,7 @@ GEM
racc (~> 1.4)
notifications-ruby-client (5.4.0)
jwt (>= 1.5, < 3)
observer (0.1.2)
orm_adapter (0.5.0)
parallel (1.23.0)
parser (3.3.6.0)
Expand Down Expand Up @@ -371,11 +371,14 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
redis (4.8.1)
redis (5.3.0)
redis-client (>= 0.22.0)
redis-actionpack (5.5.0)
actionpack (>= 5)
redis-rack (>= 2.1.0, < 4)
redis-store (>= 1.1.0, < 2)
redis-client (0.22.2)
connection_pool
redis-namespace (1.11.0)
redis (>= 4)
redis-rack (3.0.0)
Expand All @@ -393,8 +396,9 @@ GEM
railties (>= 5.2)
rexml (3.3.9)
rollbar (3.6.0)
rollout (2.5.0)
redis (~> 4.0)
rollout (2.6.1)
observer
redis (>= 4.0, < 6)
rollout-ui (0.5.3)
rollout (~> 2.5)
sinatra (~> 2.0)
Expand Down Expand Up @@ -448,10 +452,11 @@ GEM
sexp_processor (4.16.1)
shoulda-matchers (6.1.0)
activesupport (>= 5.2.0)
sidekiq (6.5.12)
connection_pool (>= 2.2.5, < 3)
rack (~> 2.0)
redis (>= 4.5.0, < 5)
sidekiq (7.3.6)
connection_pool (>= 2.3.0)
logger
rack (>= 2.2.4)
redis-client (>= 0.22.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand Down Expand Up @@ -589,7 +594,7 @@ DEPENDENCIES
rails (~> 6)
rails-controller-testing
rails_layout
redis (< 5)
redis (~> 5)
redis-actionpack
redis-namespace
redis-store
Expand All @@ -599,7 +604,7 @@ DEPENDENCIES
rspec-rails
selenium-webdriver
shoulda-matchers
sidekiq (~> 6.5.10)
sidekiq (~> 7)
simplecov (~> 0.22.0)
simplecov-lcov (~> 0.8.0)
spring
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ documentation](/doc/getting-started.md) for instructions.

## Errors and monitoring

TBC
### Errors

We send errors to a dxw owned [Rollbar
project](https://rollbar.com/dxw/dsit-roda/), contact dxw support to get access.

## Architecture decision records We use ADRs to document architectural decisions
We use ADRs to document architectural decisions that we make. They can be found
Expand Down
2 changes: 1 addition & 1 deletion backing-services-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
volumes:
- db_data:/var/lib/postgresql/data
redis:
image: redis:4
image: redis:7
ports:
- "6379:6379"
volumes:
Expand Down
4 changes: 1 addition & 3 deletions config/initializers/rollout.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
require "redis"

ROLLOUT = Rollout.new(Redis.current)
ROLLOUT = Rollout.new(Redis.new(url: ENV["REDIS_URL"]))

ROLLOUT.define_group(:beis_users) do |user|
user.service_owner?
Expand Down
4 changes: 4 additions & 0 deletions docker-compose.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@ services:
- app_test:latest
depends_on:
- db
- redis
environment:
DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: "true"
DATABASE_URL: postgres://postgres:password@db:5432/roda_test
REDIS_URL: redis://redis:6379
env_file:
- .env.test
db:
image: postgres:13
environment:
POSTGRES_PASSWORD: password
redis:
image: redis:7
9 changes: 0 additions & 9 deletions script/cibuild

This file was deleted.

1 change: 0 additions & 1 deletion spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
abort("The Rails environment is running in production mode!") if Rails.env.production?
require "rspec/rails"
# Add additional requires below this line. Rails is not loaded until this point!
require "fakeredis/rspec"

# testing strip_attributes
require "strip_attributes/matchers"
Expand Down

0 comments on commit 4b37577

Please sign in to comment.