Skip to content

Commit acdb9f9

Browse files
authored
chore: upgrade node and ruby (#261)
1 parent db1229f commit acdb9f9

File tree

18 files changed

+3354
-4065
lines changed

18 files changed

+3354
-4065
lines changed

.dockerignore

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

.github/workflows/dev.yml

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,12 @@ on:
66
workflow_dispatch:
77

88
jobs:
9-
docker_publish:
10-
needs: deploy
11-
12-
runs-on: ubuntu-latest
13-
14-
steps:
15-
- uses: actions/checkout@v2
16-
- name: Publish to Registry
17-
uses: elgohr/Publish-Docker-Github-Action@master
18-
with:
19-
name: standardnotes/listed
20-
username: ${{ secrets.DOCKER_USERNAME }}
21-
password: ${{ secrets.DOCKER_PASSWORD }}
22-
tags: "latest,${{ github.sha }}"
23-
249
deploy:
2510
runs-on: ubuntu-latest
26-
2711
steps:
2812
- uses: actions/checkout@v2
2913
- name: Set up Ruby
3014
uses: ruby/setup-ruby@v1
31-
with:
32-
ruby-version: 2.6
3315
- uses: actions/cache@v2
3416
with:
3517
path: vendor/bundle
@@ -62,20 +44,9 @@ jobs:
6244
LISTED_SSH_SERVER: ${{ secrets.LISTED_SSH_SERVER_DEV }}
6345
LISTED_SSH_DEPLOY_TO: ${{ secrets.LISTED_SSH_DEPLOY_TO_DEV }}
6446

65-
notify_discord:
66-
needs: deploy
67-
68-
runs-on: ubuntu-latest
69-
70-
steps:
71-
- name: Run Discord Webhook
72-
uses: johnnyhuy/actions-discord-git-webhook@main
73-
with:
74-
webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}
75-
7647
code_scanning:
7748
runs-on: ubuntu-latest
78-
49+
continue-on-error: true
7950
steps:
8051
- uses: actions/checkout@v2
8152
- name: Runs Brakeman vulnerability scanner

.github/workflows/pr.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ name: PR
22

33
on:
44
pull_request:
5-
branches: [ develop ]
5+
branches: [ master ]
66

77
jobs:
88
test:
9-
109
runs-on: ubuntu-latest
11-
1210
steps:
1311
- uses: actions/checkout@v2
1412
- name: Runs Brakeman vulnerability scanner

.github/workflows/prod.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,12 @@ on:
66
workflow_dispatch:
77

88
jobs:
9-
docker_publish:
10-
runs-on: ubuntu-latest
11-
12-
steps:
13-
- uses: actions/checkout@v2
14-
- name: Publish to Registry
15-
uses: elgohr/Publish-Docker-Github-Action@master
16-
with:
17-
name: standardnotes/listed
18-
username: ${{ secrets.DOCKER_USERNAME }}
19-
password: ${{ secrets.DOCKER_PASSWORD }}
20-
tags: "stable,${{ github.sha }}"
21-
229
deploy:
2310
runs-on: ubuntu-latest
24-
2511
steps:
2612
- uses: actions/checkout@v2
2713
- name: Set up Ruby
2814
uses: ruby/setup-ruby@v1
29-
with:
30-
ruby-version: 2.6
3115
- uses: actions/cache@v2
3216
with:
3317
path: vendor/bundle
@@ -59,14 +43,3 @@ jobs:
5943
LISTED_SSH_USER: ${{ secrets.LISTED_SSH_USER_PROD }}
6044
LISTED_SSH_SERVER: ${{ secrets.LISTED_SSH_SERVER_PROD }}
6145
LISTED_SSH_DEPLOY_TO: ${{ secrets.LISTED_SSH_DEPLOY_TO_PROD }}
62-
63-
notify_discord:
64-
needs: deploy
65-
66-
runs-on: ubuntu-latest
67-
68-
steps:
69-
- name: Run Discord Webhook
70-
uses: johnnyhuy/actions-discord-git-webhook@main
71-
with:
72-
webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.18.2
1+
16.15.1

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.7.6

Dockerfile

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

Gemfile

Lines changed: 31 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,67 +5,53 @@ git_source(:github) do |repo_name|
55
"https://github.com/#{repo_name}.git"
66
end
77

8-
gem 'rails', '= 5.2.5'
9-
gem 'mysql2'
10-
gem 'puma', '~> 4.3'
11-
gem 'sass-rails', '~> 5.0'
12-
gem 'uglifier', '>= 1.3.0'
13-
gem 'safe_yaml'
148
gem 'dotenv-rails', '~> 2.7.6'
15-
gem 'sanitize'
16-
gem 'rouge'
179
gem 'haml-rails'
18-
gem 'whenever'
19-
gem 'redcarpet'
10+
gem 'mini_racer', platforms: :ruby
11+
gem 'mysql2', '>= 0.3.13', '< 0.5'
12+
gem 'puma', '~> 4.3'
2013
gem 'rack-cors', :require => 'rack/cors'
14+
gem 'rails', '= 5.2.5'
2115
gem 'react_on_rails', '11.3'
16+
gem 'redcarpet'
17+
gem 'rouge'
18+
gem 'safe_yaml'
19+
gem 'sanitize'
20+
gem 'sass-rails', '~> 5.0'
21+
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
22+
gem 'uglifier', '>= 1.3.0'
2223
gem 'webpacker', '~> 4'
24+
gem 'whenever'
25+
gem "aws-sdk-acm", "~> 1.34"
26+
gem "aws-sdk-elasticloadbalancingv2", "~> 1.47"
27+
gem "aws-sdk-route53", "~> 1.40"
28+
gem "aws-sdk-sns", "~> 1.49"
29+
gem "aws-sdk-sqs", "~> 1.48"
30+
gem "capistrano-shoryuken", "~> 0.1.5"
31+
gem "lograge", "~> 0.11.2"
32+
gem "newrelic_rpm", "= 8.2.0"
33+
gem "newrelic-infinite_tracing", "= 8.2.0"
34+
gem "rails-letsencrypt", "~> 0.9.0"
35+
gem "shoryuken", "~> 5.3"
2336

2437
group :development, :test do
2538
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
2639
gem 'byebug', platform: :mri
2740
end
2841

2942
group :development do
30-
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
31-
gem 'web-console', '>= 3.3.0'
32-
gem 'listen', '~> 3.0.5'
33-
gem 'spring'
34-
gem 'spring-watcher-listen', '~> 2.0.0'
35-
gem 'rb-readline'
36-
# Deployment tools
37-
gem 'capistrano'
43+
gem 'brakeman'
3844
gem 'capistrano-bundler'
45+
gem 'capistrano-git-submodule-strategy', '~> 0.1.22'
3946
gem 'capistrano-passenger', '>= 0.2.0'
4047
gem 'capistrano-rails'
4148
gem 'capistrano-rvm'
4249
gem 'capistrano-sidekiq'
43-
gem 'capistrano-git-submodule-strategy', '~> 0.1.22'
50+
gem 'capistrano'
51+
gem 'listen', '~> 3.0.5'
52+
gem 'rb-readline'
53+
gem 'spring-watcher-listen', '~> 2.0.0'
54+
gem 'spring'
55+
gem 'web-console', '>= 3.3.0'
4456
end
4557

46-
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
47-
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
48-
gem 'mini_racer', platforms: :ruby
49-
50-
51-
gem "rails-letsencrypt", "~> 0.9.0"
52-
53-
gem "aws-sdk-acm", "~> 1.34"
54-
55-
gem "aws-sdk-elasticloadbalancingv2", "~> 1.47"
56-
57-
gem "lograge", "~> 0.11.2"
58-
59-
gem "aws-sdk-route53", "~> 1.40"
60-
61-
gem "newrelic_rpm", "= 8.2.0"
62-
63-
gem "newrelic-infinite_tracing", "= 8.2.0"
64-
65-
gem "shoryuken", "~> 5.3"
66-
67-
gem "capistrano-shoryuken", "~> 0.1.5"
68-
69-
gem "aws-sdk-sqs", "~> 1.48"
70-
71-
gem "aws-sdk-sns", "~> 1.49"

0 commit comments

Comments
 (0)