Skip to content
This repository has been archived by the owner on Jul 14, 2024. It is now read-only.

DNZ Quarterly Updates #12

Merged
merged 63 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
aba3f7a
feat: Make credentials environment variables to prevent open source u…
May 2, 2024
caf1c79
feat: Trigger mirrored pipeline
May 2, 2024
c100703
feat: Trigger mirrored pipeline
May 2, 2024
5a804c3
feat: Trigger mirrored pipeline
May 5, 2024
644b6cd
feat: Trigger mirrored pipeline
May 5, 2024
2e339d4
feat: Trigger mirrored pipeline
May 5, 2024
ee02af0
refactor: require selenium and remove webdrivers
May 5, 2024
be40f13
fix: put gems in alphabetical order
May 5, 2024
f5d19a5
Merge pull request #65 from DigitalNZ/dl/credentials-refactor
danielaboost May 5, 2024
9e80eb2
feat: Add mirror to gitlab ci step
May 5, 2024
d9b17f9
feat: Remove git ignore for removed file
May 5, 2024
ea7344c
Merge pull request #67 from DigitalNZ/dl/pco-changes
danielaboost May 6, 2024
cc008df
feat: Upgrade rubocop
May 9, 2024
dd42281
feat: Upgrade rubocop
May 9, 2024
85c1250
feat: Upgrade letter opener
May 9, 2024
e1f16a0
feat: Update selenium-webdriver
May 9, 2024
0027a0f
feat: Upgrade rspec gems
May 9, 2024
dd5b1d7
feat: Upgrade puma
May 12, 2024
23a4e91
feat: Upgrade capybara
May 12, 2024
231be34
feat: Upgrade rubocop
May 12, 2024
1f67673
feat: Upgrade faker
May 12, 2024
2697355
feat: Update rack-mini-profiler
May 12, 2024
ce08d13
fix: Fix deprecation warning
May 12, 2024
e65dbaf
feat: Upgrade webmock
May 12, 2024
8e40b0f
feat: Update debug gem
May 13, 2024
b11330b
feat: Upgrade devise
May 13, 2024
c2bdf59
feat: Update shoulda-matchers
May 13, 2024
f51adb1
feat: Upgrade faraday
May 13, 2024
53f038d
feat: Update faraday
May 13, 2024
0d5ce5e
feat: Upgrade vite-rails
May 13, 2024
a60de62
feat: Upgrade alpine version
May 13, 2024
a00a695
feat: Update node version for prettier
May 13, 2024
751ed4d
feat: Upgrade foreman
May 13, 2024
4da26bc
feat: Update fugit
May 13, 2024
3af5375
feat: Remove old CVE ignore
May 13, 2024
359d297
feat: Remove old CVE ignore
May 13, 2024
800432f
feat: Remove old CVE ignore
May 13, 2024
330fde8
feat: Upgrade redis-client
May 13, 2024
21f10a1
feat: Upgrade better_html
May 13, 2024
02f86f3
feat: Upgrade sprockets
May 13, 2024
881c181
feat: Update sidekiq
May 13, 2024
ae77436
feat: Upgrade optparse
May 13, 2024
2358a95
feat: Upgrade nokogiri
May 13, 2024
6bda623
feat: Upgrade jsonpath
May 13, 2024
353afe7
feat: Upgrade sidekiq-cron
May 13, 2024
44ee0b5
feat: Upgrade jest
May 13, 2024
26f3687
feat: Upgrade vite-plugin-full-reload
May 13, 2024
76b2dc7
feat: Upgrade axios
May 13, 2024
c44a994
feat: upgrade classnames
May 13, 2024
ae32b1e
feat: Upgrade jest-environment-jsdom
May 15, 2024
90785f4
feat: Upgrade msw
May 15, 2024
86e2e7a
feat: upgrade @codemirror/lang-html
May 15, 2024
b39a6f3
feat: upgrade xml-formatter
May 15, 2024
6a678b9
fix: Fix spelling of development
May 15, 2024
6805e28
feat: Yarn upgrades
May 15, 2024
a82cc54
fix: Fix for upgraded bootstrap version to make cards white
May 15, 2024
3de0f2a
test: Try installing aws-cli with spk
May 15, 2024
b6ef4c9
refactor: Move comment to where it is applicable
May 15, 2024
7faa600
fix: Downgrade bootstrap
May 16, 2024
a1d2487
Merge remote-tracking branch 'upstream/main' into rm/dnz-updates-01
richardmatthewsdev May 19, 2024
2fa4315
Merge pull request #68 from DigitalNZ/dl/harvester-qu-may-24
danielaboost May 19, 2024
4d3c536
Merge remote-tracking branch 'upstream/main' into rm/dnz-updates-01
richardmatthewsdev May 19, 2024
180cc3c
Add JaroWrinkler gem
richardmatthewsdev May 20, 2024
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
3 changes: 0 additions & 3 deletions .bundler-audit.yml

This file was deleted.

17 changes: 17 additions & 0 deletions .github/workflows/mirror_to_gitlab.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Mirror to GitLab

on: [push]

jobs:
mirror-repository:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: mirror-repository
uses: yesolutions/mirror-action@master
with:
REMOTE: ${{ secrets.GITLAB_REPO_SSH }}
GIT_SSH_PRIVATE_KEY: ${{ secrets.GIT_SSH_PRIVATE_KEY }}
GIT_SSH_NO_VERIFY_HOST: ${{ secrets.GIT_SSH_NO_VERIFY_HOST }}
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- run: yarn install
- name: prettier
run: yarn run prettier --check .
Expand Down
10 changes: 3 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM ruby:3.2.2-alpine3.18
FROM ruby:3.2.2-alpine3.19

WORKDIR /app

ARG BUILD_PACKAGES="build-base curl-dev git"
ARG DEV_PACKAGES="bash mysql-client mariadb-dev yaml-dev zlib-dev nodejs yarn libxml2 libxml2-dev libxslt libxslt-dev gmp-dev openjdk8-jre python3 py3-pip"
# AWS CLI is used to run the S3 extraction
ARG DEV_PACKAGES="bash mysql-client mariadb-dev yaml-dev zlib-dev nodejs yarn libxml2 libxml2-dev libxslt libxslt-dev gmp-dev openjdk8-jre python3 py3-pip aws-cli"
ARG RUBY_PACKAGES="tzdata"

WORKDIR /app
Expand All @@ -24,11 +25,6 @@ RUN gem install bundler -v $(tail -n1 Gemfile.lock) \
&& find $GEM_HOME/gems/ -name "*.c" -delete \
&& find $GEM_HOME/gems/ -name "*.o" -delete

# AWS CLI is used to run the S3 extraction

RUN pip3 install --upgrade pip
RUN pip3 install awscli

COPY package.json yarn.lock ./
RUN yarn install --production

Expand Down
10 changes: 6 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '3.2.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
gem 'rails', '~> 7.0.4'
gem 'rails', '~> 7.1.3.2'

# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem 'sprockets-rails'
Expand All @@ -15,13 +15,15 @@ gem 'sprockets-rails'
gem 'mysql2', '~> 0.5'

# Use the Puma web server [https://github.com/puma/puma]
gem 'puma', '~> 5.0'
gem 'puma', '~> 6.0'

gem 'elastic-apm'
gem 'vite_rails'

gem 'rack-mini-profiler'

gem 'jaro_winkler'

# handles pagination
gem 'kaminari'

Expand All @@ -37,7 +39,7 @@ gem 'devise-two-factor'
gem 'rqrcode'

# extraction related
gem 'faraday', '~> 2.7'
gem 'faraday', '~> 2.9'
gem 'faraday-follow_redirects'
gem 'jsonpath'
gem 'nokogiri'
Expand Down Expand Up @@ -84,8 +86,8 @@ group :test do
gem 'capybara-screenshot'
gem 'factory_bot_rails'
gem 'faker'
gem 'selenium-webdriver'
gem 'shoulda-matchers'
gem 'webdrivers', require: false

# generates code coverage reports
gem 'simplecov'
Expand Down
Loading
Loading