Skip to content

Commit 8b923fd

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/custom-links-in-dropdown
2 parents 6d8a7aa + 944f286 commit 8b923fd

File tree

196 files changed

+3289
-2265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+3289
-2265
lines changed

.allow_skipping_tests

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
blueprints/api/v1/session_blueprint.rb
22
channels/application_cable/channel.rb
33
channels/application_cable/connection.rb
4-
controllers/bulk_court_dates_controller.rb
54
controllers/case_groups_controller.rb
65
controllers/concerns/court_date_params.rb
76
controllers/followup_reports_controller.rb

.devcontainer/.env.codespaces

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ PG_USERNAME=postgres
44
PG_PASSWORD=postgres
55
DELAYED_JOB_USERNAME='admin'
66
DELAYED_JOB_PASSWORD='password'
7+
FLIPPER_USERNAME="admin"
8+
FLIPPER_PASSWORD="password"

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"version": "latest"
2626
},
2727
"ghcr.io/devcontainers/features/node:1": {
28-
"version": "latest"
28+
"version": "20.16.0"
2929
}
3030
},
3131

.env.example

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ POSTGRES_USER=postgres
22
POSTGRES_PORT=5432
33
POSTGRES_PASSWORD=password
44
DATABASE_HOST=localhost
5-
5+
FLIPPER_USERNAME="admin"
6+
FLIPPER_PASSWORD="password"

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
2-
* @compwron @FireLemons @littleforest @elasticspoon
2+
* @compwron @FireLemons @elasticspoon
33

44
/app/javascript/ @schoork @FireLemons @elasticspoon

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ jobs:
2626
- name: Set up JS
2727
uses: actions/setup-node@v4
2828
with:
29-
node-version: lts/gallium
29+
node-version-file: '.nvmrc'
3030
cache: "yarn"
3131

3232
rspec_parallel:
3333
needs: [preparation]
3434
strategy:
3535
fail-fast: false
3636
matrix:
37-
groups: ["[0, 1, 2]", "[3, 4, 5]", "[6, 7, 8]", "[9, 10, 11]"]
37+
groups: ["[0, 1, 2, 3]", "[4, 5, 6, 7]", "[8, 9, 10, 11]"]
3838
uses: ./.github/workflows/rspec_parallel.yml
3939
secrets: inherit
4040
with:
4141
groups: ${{ matrix.groups }}
4242
group_count: 12 # the total number of test groups, must match the groups listed in the matrix.groups
43-
parallel_processes_count: 3 # the number of parallel processes to run tests in worker, must match the size of the
43+
parallel_processes_count: 4 # the number of parallel processes to run tests in worker, must match the size of the
4444
# inner arrays in the matrix.groups
4545
combine_and_report:
4646
if: ${{ !cancelled() }}

.github/workflows/docker.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
timeout-minutes: 20
2424
env:
2525
RAILS_ENV: test
26+
TEST_MAX_DURATION: 60
2627
steps:
2728
- name: Checkout repository
2829
uses: actions/checkout@v4
@@ -31,13 +32,13 @@ jobs:
3132
mkdir -p tmp/downloads
3233
chmod 777 tmp tmp/downloads
3334
- name: docker UP
34-
run: docker-compose up -d
35-
- name: db:reset
36-
run: docker-compose exec -T web rails db:reset
35+
run: docker compose up -d
36+
- name: db:setup
37+
run: docker compose exec -T web rails db:setup
3738
- name: compile assets
38-
run: docker-compose exec -T web bundle exec rails assets:precompile
39+
run: docker compose exec -T web bundle exec rails assets:precompile
3940
- name: Test
40-
run: docker-compose exec -T web bundle exec rspec spec --format documentation
41+
run: docker compose exec -T web bundle exec rspec spec --fail-fast
4142

4243
- name: Archive selenium screenshots
4344
if: ${{ failure() }}

.github/workflows/rspec.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
timeout-minutes: 20
2121
env:
2222
RAILS_ENV: test
23+
TEST_MAX_DURATION: 60
2324

2425
services:
2526
db:
@@ -45,7 +46,7 @@ jobs:
4546
- name: Set up JS
4647
uses: actions/setup-node@v4
4748
with:
48-
node-version: lts/gallium
49+
node-version-file: '.nvmrc'
4950
cache: "yarn"
5051
- run: yarn
5152

.github/workflows/rspec_parallel.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
rspec_parallel:
2222
name: RSpec Groups ${{ inputs.groups }}
2323
runs-on: ubuntu-latest
24-
timeout-minutes: 4
2524
env:
2625
RAILS_ENV: test
26+
TEST_MAX_DURATION: 45
2727
BUNDLE_WITHOUT: "development"
2828
CI_TOTAL_JOBS: ${{ inputs.group_count }}
2929
CI_JOB_INDEX: ${{ inputs.groups }}
@@ -61,7 +61,7 @@ jobs:
6161
- name: Set up JS
6262
uses: actions/setup-node@v4
6363
with:
64-
node-version: lts/gallium
64+
node-version-file: '.nvmrc'
6565
cache: "yarn"
6666
- run: yarn
6767

@@ -110,12 +110,10 @@ jobs:
110110
RUBYOPT='-W:no-deprecated -W:no-experimental' bundle exec parallel_rspec \
111111
-n "${CI_TOTAL_JOBS}" \
112112
--only-group "${CI_JOB_INDEX}" \
113-
--runtime-log old_parallel_runtime.log \
114-
--verbose ./spec
113+
--runtime-log old_parallel_runtime.log ./spec
115114
116115
# echo 'Tests completed. Uploading to Code Climate'
117116
# ./cc-test-reporter after-build --exit-code $?
118-
# cat tmp/spec_summary.log
119117
120118
- name: Compress reports
121119
if: ${{ !cancelled() }}

.github/workflows/yarn_lint_and_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- uses: actions/setup-node@v4
3232
with:
33-
node-version: lts/gallium
33+
node-version-file: '.nvmrc'
3434

3535
- run: yarn
3636
- run: yarn lint

0 commit comments

Comments
 (0)