Skip to content

Commit

Permalink
Merge pull request #4504 from brave-intl/staging
Browse files Browse the repository at this point in the history
Prod Release 09-18-2024
  • Loading branch information
jlbyrne committed Sep 18, 2024
2 parents 2342d8e + 165f79b commit c127fad
Show file tree
Hide file tree
Showing 91 changed files with 8,039 additions and 3,184 deletions.
5 changes: 4 additions & 1 deletion .audit-ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
"GHSA-78xj-cgh5-2h22",
"GHSA-c429-5p7v-vgjp",
"GHSA-cxjh-pqwp-8mfp|react-scripts>webpack-dev-server>http-proxy-middleware>http-proxy>follow-redirects",
"GHSA-67hx-6x53-jw92"
"GHSA-67hx-6x53-jw92",
"GHSA-49q7-c7j4-3p7m|crypto-browserify>browserify-sign>elliptic",
"GHSA-977x-g7h5-7qgw|crypto-browserify>browserify-sign>elliptic",
"GHSA-f7q4-pwc6-w24p|crypto-browserify>browserify-sign>elliptic"
]
}
14 changes: 9 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3.1
- name: Setup firefox
uses: browser-actions/setup-firefox@0f622aed2a492183149a5a5c347205a593802e10 # v1.3.0
with:
firefox-version: "latest-esr"
- name: Bundle install
run: |
bundle config path vendor/bundle
Expand All @@ -64,12 +60,20 @@ jobs:
run: cd public/creators-landing && yarn install && yarn build
env:
process.env.CI : false
- name: NewUI install
run: cd nextjs && npm install
env:
process.env.CI: false
- name: NewUI build
run: cd nextjs && node scripts/copyLeoIcons.js && npm run build
env:
process.env.CI: false
- name: Prepare database
run: PREPARING_DATABASE=1 RAILS_ENV=test bundle exec rails db:prepare
env:
DATABASE_URL_TEST: postgres://postgres:postgres@localhost:5432/brave_publishers_test
- name: Run tests
run: USE_MINITEST_RETRY=1 NODE_OPTIONS=--openssl-legacy-provider RAILS_ENV=test bundle exec rails test
run: USE_MINITEST_RETRY=1 NODE_OPTIONS=--openssl-legacy-provider RAILS_ENV=test ./bin/run_tests.sh
env:
DATABASE_URL_TEST: postgres://postgres:postgres@localhost:5432/brave_publishers_test
BAT_RATIOS_URL: https://ratios.rewards.bravesoftware.com
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ gem "activerecord-postgres_enum"
# Use AWS gem for s3 uploads
gem "aws-sdk-s3", "~> 1.143.0"

gem "bootstrap", "4.6.2"
gem "bootstrap", "5.3.3"

gem "brotli", "~> 0.5.0"

Expand Down Expand Up @@ -116,7 +116,7 @@ gem "redis-session-store"
gem "render_async", "~> 2.1"

# For ruby 3
gem "rexml"
gem "rexml", ">= 3.3.6"

# Generate QR codes for TOTP 2fa
gem "rqrcode", "~> 2.2.0"
Expand Down
Loading

0 comments on commit c127fad

Please sign in to comment.