Skip to content

Commit ca726b6

Browse files
authored
Merge pull request #4934 from brave-intl/staging
Prod Release 08-20-2025
2 parents b01f786 + 8a043c2 commit ca726b6

File tree

18 files changed

+110
-124
lines changed

18 files changed

+110
-124
lines changed

.github/workflows/audit.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
--health-timeout 5s
2828
--health-retries 5
2929
steps:
30-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
31-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
30+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
31+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
3232
with:
3333
path: vendor/bundle
3434
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
3535
restore-keys: |
3636
${{ runner.os }}-gems-
3737
- name: Set up Ruby
38-
uses: ruby/setup-ruby@472790540115ce5bd69d399a020189a8c87d641f # v1.247.0
38+
uses: ruby/setup-ruby@829114fc20da43a41d27359103ec7a63020954d4 # v1.255.0
3939
with:
4040
ruby-version: 3.4.2
4141
- name: Bundle install
@@ -53,7 +53,7 @@ jobs:
5353
id: yarn-cache
5454
run: echo "::set-output name=dir::$(yarn cache dir)"
5555
- name: Setup cache key and directory for node_modules cache
56-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
56+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
5757
with:
5858
path: ${{ steps.yarn-cache.outputs.dir }}
5959
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
contents: read
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020
- name: Configure AWS Credentials
21-
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
21+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1
2222
with:
2323
role-to-assume: ${{ secrets.GDBP_AWS_IAM_ROLE_ARN }}
2424
aws-region: us-west-2

.github/workflows/lint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
--health-timeout 5s
2525
--health-retries 5
2626
steps:
27-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
28-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
27+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
28+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
2929
with:
3030
path: vendor/bundle
3131
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
3232
restore-keys: |
3333
${{ runner.os }}-gems-
3434
- name: Set up Ruby
35-
uses: ruby/setup-ruby@472790540115ce5bd69d399a020189a8c87d641f # v1.247.0
35+
uses: ruby/setup-ruby@829114fc20da43a41d27359103ec7a63020954d4 # v1.255.0
3636
with:
3737
ruby-version: 3.4.2
3838
- name: Bundle install
@@ -50,7 +50,7 @@ jobs:
5050
id: yarn-cache
5151
run: echo "::set-output name=dir::$(yarn cache dir)"
5252
- name: Setup cache key and directory for node_modules cache
53-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
53+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
5454
with:
5555
path: ${{ steps.yarn-cache.outputs.dir }}
5656
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -61,4 +61,4 @@ jobs:
6161
- name: Brakeman
6262
run: bundle exec brakeman
6363
- name: Compile Assets Check
64-
run: NODE_OPTIONS=--openssl-legacy-provider DB_ADAPTER=nulldb DATABASE_URL='nulldb://nohost' CREATORS_FULL_HOST="HOST" SECRET_KEY_BASE='KEY' RAILS_ENV=production bundle exec rake assets:precompile
64+
run: NODE_OPTIONS=--openssl-legacy-provider CREATORS_FULL_HOST="HOST" SECRET_KEY_BASE='KEY' RAILS_ENV=production bundle exec rake assets:precompile

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
--health-timeout 5s
2525
--health-retries 5
2626
steps:
27-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
28-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
27+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
28+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
2929
with:
3030
path: vendor/bundle
3131
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
3232
restore-keys: |
3333
${{ runner.os }}-gems-
3434
- name: Set up Ruby
35-
uses: ruby/setup-ruby@472790540115ce5bd69d399a020189a8c87d641f # v1.247.0
35+
uses: ruby/setup-ruby@829114fc20da43a41d27359103ec7a63020954d4 # v1.255.0
3636
with:
3737
ruby-version: 3.4.2
3838
- name: Bundle install
@@ -50,7 +50,7 @@ jobs:
5050
id: yarn-cache
5151
run: echo "::set-output name=dir::$(yarn cache dir)"
5252
- name: Setup cache key and directory for node_modules cache
53-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
53+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
5454
with:
5555
path: ${{ steps.yarn-cache.outputs.dir }}
5656
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN yarn install --frozen-lockfile
3333
COPY . .
3434

3535
# Precompiling assets for production without requiring secret RAILS_MASTER_KEY
36-
RUN NODE_OPTIONS=--openssl-legacy-provider RAILS_ENV=production CREATORS_FULL_HOST="1" SECRET_KEY_BASE="1" bundle exec rails assets:precompile DB_ADAPTER=nulldb DATABASE_URL='nulldb://nohost'
36+
RUN NODE_OPTIONS=--openssl-legacy-provider RAILS_ENV=production CREATORS_FULL_HOST="1" SECRET_KEY_BASE="1" bundle exec rails assets:precompile
3737

3838
# Now compile the homepage
3939
RUN cd public/creators-landing && yarn install && yarn build

Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ruby:3.4.5-slim
22

3-
RUN apt-get update -qq && apt-get install -y build-essential software-properties-common
3+
RUN apt-get update -qq && apt-get install -y build-essential
44
RUN apt-get update -qq
55
RUN apt-get install -y nodejs \
66
libpq-dev \

Gemfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ ruby "~> 3.4.0"
44

55
source "https://rubygems.org"
66

7-
rails_version = "7.2.2.1"
7+
rails_version = "8.0.2.1"
88
gem "rails", rails_version
99
gem "rails-html-sanitizer", "1.6.2"
1010
gem "railties", rails_version
1111

12-
gem "rack", "3.1.16"
12+
gem "rack", "3.2.0"
1313

1414
# All things countries
1515
gem "countries"
@@ -108,7 +108,7 @@ gem "puma", "~> 6.6.0"
108108
# Sanitize bad inputs coming in
109109
gem "rack-utf8_sanitizer"
110110

111-
gem "rails-i18n", "~> 7.0"
111+
gem "rails-i18n", "~> 8.0"
112112

113113
# I love captchas
114114
gem "recaptcha", "~> 5.19.0", require: "recaptcha/rails"
@@ -168,8 +168,6 @@ gem "yt", "~> 0.33"
168168
gem "zeitwerk", "~> 2.6"
169169
gem "zendesk_api", "~> 3.1.0"
170170

171-
gem "activerecord-nulldb-adapter", git: "https://github.com/taylorthurlow/nulldb", branch: "fix/activerecord72-register-adapter"
172-
173171
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
174172
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
175173

@@ -232,7 +230,7 @@ group :development, :test do
232230
gem "capybara"
233231
gem "minitest"
234232
gem "minitest-retry"
235-
gem "minitest-rails", "~> 7.2.0"
233+
gem "minitest-rails", "~> 8.0"
236234
gem "mocha", require: false
237235
gem "simplecov", require: false, group: :test
238236
gem "selenium-webdriver", "~> 4.4"

0 commit comments

Comments
 (0)