Skip to content

Commit a991a99

Browse files
authored
Merge branch 'develop' into snyk-fix-a546b097f31c256d940f84ae051811b7
2 parents 7f16162 + 8201e17 commit a991a99

87 files changed

Lines changed: 1349 additions & 656 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: RMI Backend CI
2+
3+
on:
4+
push:
5+
branches: [ develop ]
6+
pull_request:
7+
branches: [ develop ]
8+
9+
jobs:
10+
test:
11+
runs-on: ubuntu-latest
12+
13+
services:
14+
postgres:
15+
image: postgres:14
16+
ports:
17+
- 5432:5432
18+
env:
19+
POSTGRES_USER: postgres
20+
POSTGRES_PASSWORD: postgres
21+
POSTGRES_DB: data_submission_service_api_test
22+
options: >-
23+
--health-cmd "pg_isready -U postgres"
24+
--health-interval 10s
25+
--health-timeout 5s
26+
--health-retries 5
27+
28+
env:
29+
RAILS_ENV: test
30+
DATABASE_URL: postgres://postgres:postgres@localhost:5432/data_submission_service_api_test
31+
32+
steps:
33+
- name: Checkout code
34+
uses: actions/checkout@v5
35+
36+
- name: Set up Ruby
37+
uses: ruby/setup-ruby@v1
38+
with:
39+
ruby-version: 3.4.2
40+
bundler-cache: true
41+
env:
42+
BUNDLE_GEMS__CONTRIBSYS__COM: ${{ secrets.BUNDLE_GEMS__CONTRIBSYS__COM }}
43+
44+
- name: Set up Python
45+
uses: actions/setup-python@v4
46+
with:
47+
python-version: 3.11
48+
49+
- name: Install in2csv (csvkit)
50+
run: pip install csvkit
51+
52+
- name: Run migrations
53+
run: bundle exec rails db:migrate RAILS_ENV=test
54+
55+
- name: Compile assets
56+
run: bundle exec rake AWS_ACCESS_KEY_ID=dummy AWS_SECRET_ACCESS_KEY=dummy AWS_S3_REGION=dummy AWS_S3_BUCKET=dummy SECRET_KEY_BASE=dummy DATABASE_URL=postgresql:does_not_exist --quiet assets:precompile
57+
58+
- name: Run tests
59+
run: bundle exec rspec
60+
61+
- name: Run rubocop
62+
run: bundle exec rubocop

.rubocop.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ Metrics/AbcSize:
122122
- 'app/controllers/admin/suppliers_controller.rb'
123123
- 'app/controllers/v1/tasks_controller.rb'
124124
- 'app/controllers/admin/users_controller.rb'
125+
- 'app/jobs/cleanup_submission_entries_job.rb'
125126

126127
Layout/LineLength:
127128
Max: 120

.travis.yml

Lines changed: 0 additions & 66 deletions
This file was deleted.

CF/deploy-app.sh

Lines changed: 0 additions & 155 deletions
This file was deleted.

CF/manifest-template.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

CF/sidekiq-manifest-template.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Change Log
22

3+
## [release-171] - 2025-10-23
4+
5+
- NRMI-178: Clean up non-active validation_failed entries job
6+
7+
## [release-170] - 2025-10-13
8+
9+
- NRMI-143: fix unpermitted aria attribute accessibility error
10+
- NRMI-152: QA observation of inconsistent banner colours
11+
- NRMI-172: set up github actions
12+
- NRMI-166: Add archived agreement status
13+
- NRMI-177: Delete validation failed submission entries when resolved
14+
315
## [release-169] - 2025-08-18
416

517
- NRMI-153: fix for overflowing supplier page table
@@ -1121,6 +1133,8 @@ this should have been released in release 45 but wasn't actually merged
11211133

11221134
Initial release
11231135

1136+
[release-171]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-170...release-171
1137+
[release-170]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-169...release-170
11241138
[release-169]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-168...release-169
11251139
[release-168]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-167...release-168
11261140
[release-167]: https://github.com/Crown-Commercial-Service/DataSubmissionServiceAPI/compare/release-166...release-167

0 commit comments

Comments
 (0)