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

Updated build process #101

Merged
merged 38 commits into from
Jun 2, 2023
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
2b5e613
feat: Updated accessibility statement
jonrandahl Oct 7, 2022
09941e2
style: Updated Welsh translation to improve punctuation
jonrandahl Oct 7, 2022
05a49b1
docs: Updated changelog and version cadence
jonrandahl Oct 7, 2022
ed8f949
build: Updated Gemfile.lock
jonrandahl Oct 7, 2022
1bcb840
feat: Updated Welsh Translation
jonrandahl Oct 10, 2022
90159c4
docs: Updated Changelog
jonrandahl Oct 10, 2022
b8c0f03
style: Updated special characters to use entity codes
jonrandahl Oct 11, 2022
ae2ee59
feat: Refactored code snippets
jonrandahl Oct 11, 2022
6391fa9
feat: Removed duplicated main element
jonrandahl Oct 11, 2022
a6a63e6
Merge pull request #90 from epimorphics/issue/106-hmlr-accessibility-…
jonrandahl Oct 12, 2022
376965a
build: Updated build process
jonrandahl Mar 16, 2023
d9da57a
refactor: Removed erroneous comments
jonrandahl Mar 16, 2023
b32823d
docs: Updated CHANGELOG, README, and version cadence
jonrandahl Mar 16, 2023
29a58a8
build: removed lint and test from make image
jonrandahl Mar 16, 2023
cefc0f9
build: cleanup of build files for LR apps
jonrandahl Mar 20, 2023
99f2595
build: unified environment configurations across all apps
jonrandahl Mar 21, 2023
7d1854e
fix: restored merge conflict overwrite
jonrandahl Mar 21, 2023
c376514
docs: README update
jonrandahl Mar 21, 2023
fde56ee
docs: README update
jonrandahl Mar 22, 2023
e04b889
Merge branch 'dev' into spike/resolve-failed-build
jonrandahl Mar 22, 2023
fdcde8e
docs: Updated CHANGELOG
jonrandahl Mar 22, 2023
4372f54
build: Clarified use of Run-time env var purpose
jonrandahl Mar 22, 2023
83bc36d
Merge remote-tracking branch 'origin/dev-infrastructure' into spike/r…
jonrandahl Mar 23, 2023
fa7baee
build: resolving `config.relative_url_root`
jonrandahl Mar 23, 2023
dee3da4
build: better logging on start-up
jonrandahl Mar 23, 2023
24b3283
docs: Updated CHANGELOG and README
jonrandahl Mar 23, 2023
fe7c063
docs: Fixed typo
jonrandahl Mar 23, 2023
72a8aff
Merge remote-tracking branch 'origin/dev-infrastructure' into spike/r…
jonrandahl Mar 24, 2023
23873e6
Merge branch 'dev-infrastructure' into spike/resolve-failed-build
jonrandahl Mar 24, 2023
623ace4
Merge branch 'dev-infrastructure' into spike/resolve-failed-build
jonrandahl Mar 29, 2023
fbcaba5
refactor: updated robocop rules
jonrandahl Apr 19, 2023
07e93a8
fix: adjusted error reporting environments
jonrandahl Apr 19, 2023
de6f08c
build: environment specific configurations
jonrandahl Apr 19, 2023
f77740d
build: streamlined entrypoint script
jonrandahl Apr 19, 2023
cec28ee
build: Updated gems and lock file
jonrandahl Apr 19, 2023
880a019
docs: Improved README
jonrandahl Apr 19, 2023
e49f272
build: cleaned BUNDLE_CONFIG
jonrandahl May 15, 2023
01e4de0
docs: Updated README header
jonrandahl May 23, 2023
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
42 changes: 29 additions & 13 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
# Change log for HMLR landing page app

This app presents the landing page experience for
landregistry.data.gov.uk, including the SPARQL
Qonsole
This app presents the landing page experience for landregistry.data.gov.uk,
including the SPARQL Qonsole

## 1.7.1 - 2023-03-23

- (Jon) Updated to handle locking the root path for individual environments as
well as removing unnecessary environment variables.
- (Jon) Updated the README to improve the clarity of the instructions for
running the application locally.
- (Jon) Resolved incorrect traps for missing env vars in `entrypoint.sh`, added
updated commands for `Dockerfile`, as well as added new `SHORTNAME` variable
to `Makefile`.

## 1.7.0 - 2023-03-15

Expand All @@ -27,6 +36,13 @@ Qonsole
monitoring, and updated version of Sentry.
- (Ian) Updated the README as part of handover.

## 1.5.8 - 2022-10-10

- (Jon) Updated accessibility statement to reflect the adjusted release dates
for both the expected Qonsole update and preparation timestamp alongside the
removal of the deadlines for test revisions. Also includes minor copy changes
to resolve typos/punctuation issues.

## 1.5.7 - 2021-12-01

- (Mairead) Added deployment sub repo and assisting deployment files
Expand Down Expand Up @@ -75,8 +91,8 @@ Qonsole

- WCAG conformance updates, including updating to the upstream
`lr_common_styles`
- removed UKHPI documentation, now that this is available from the
UKHPI app itself
- removed UKHPI documentation, now that this is available from the UKHPI app
itself

## 1.2.2 - 2020-07-06

Expand All @@ -92,23 +108,23 @@ Qonsole

## 1.1.0 - 2019-12-17

- Changed minor version number as we've switched to using a
separate Sentry project for this app.
- Changed minor version number as we've switched to using a separate Sentry
project for this app.

## 1.0.7 - 2019-12-16

- Update qonsole-rails to (hopefully) reduce Sentry noise due to
path issues with error pages.
- Update qonsole-rails to (hopefully) reduce Sentry noise due to path issues
with error pages.

## 1.0.6 - 2019-12-10

- Remove a reference to an old, now obsolete, dev
server as a target endpoint for Qonsole
- Remove a reference to an old, now obsolete, dev server as a target endpoint
for Qonsole

## 1.0.5 - 2019-12-09

- Pull in updated `qonsole-rails` to resolve Sentry warning
of unbound variable `e`
- Pull in updated `qonsole-rails` to resolve Sentry warning of unbound variable
`e`

## 2019-11-15 - 1.0.4

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ COPY config config
COPY lib lib
COPY public public

# Compile
# Compile assets
RUN RAILS_ENV=production \
bundle exec rake assets:precompile \
&& mkdir -m 777 /usr/src/app/coverage
Expand Down
8 changes: 5 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,16 @@ group :development do
end

# rubocop:disable Layout/LineLength
gem 'qonsole-rails', git: 'https://github.com/epimorphics/qonsole-rails'
# TODO: While running the rails app locally for testing you can set gems to your local path
# ! These "local" paths do not work with a docker image - use the repo instead
# gem 'qonsole-rails', path: '~/Epimorphics/clients/land-registry/projects/qonsole-rails'

# TODO: For running the app locally for testing you can set this to your local path
# gem 'json_rails_logger', '~> 0.3.5', path: '~/Epimorphics/shared/json-rails-logger/'
# gem 'lr_common_styles', '~> 1.9.1', path: '~/Epimorphics/clients/land-registry/projects/lr_common_styles/'
# rubocop:enable Layout/LineLength

# TODO: In production you want to set this to the gem from the epimorphics github repo
gem 'qonsole-rails', git: 'https://github.com/epimorphics/qonsole-rails'

# TODO: In production you want to set this to the gem from the epimorphics package repo
source 'https://rubygems.pkg.github.com/epimorphics' do
gem 'json_rails_logger', '~> 0.3.5'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -259,11 +259,11 @@ GEM
GEM
remote: https://rubygems.pkg.github.com/epimorphics/
specs:
json_rails_logger (0.3.5.3)
json_rails_logger (0.3.5.4)
json
lograge
railties
lr_common_styles (1.9.1.1)
lr_common_styles (1.9.1.2)
bootstrap-sass (~> 3.4.0)
font-awesome-rails (~> 4.7.0.1)
govuk_elements_rails (~> 2.0.0)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ IMAGE?=${NAME}/${STAGE}
REPO?=${ECR}/${IMAGE}

GITHUB_TOKEN=.github-token
BUNDLE_CFG=${HOME}/.bundle/config
BUNDLE_CFG=.bundle/config

all: image

Expand Down
Loading