Skip to content

Commit 74a24fb

Browse files
committed
Merge remote-tracking branch 'origin/main' into doorgan/multiroot_support
2 parents c0c879a + 39d4b2f commit 74a24fb

File tree

267 files changed

+1823
-2202
lines changed

Some content is hidden

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

267 files changed

+1823
-2202
lines changed

.credo.exs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
{Credo.Check.Readability.PreferImplicitTry, false},
1919
{Credo.Check.Refactor.CyclomaticComplexity, max_complexity: 10},
2020
{Credo.Check.Refactor.Nesting, max_nesting: 3},
21+
{Credo.Check.Design.TagTODO, false},
22+
{Credo.Check.Design.TagFIXME, false},
2123
{Credo.Check.Refactor.PipeChainStart, []}
2224
]
2325
}

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: "/"
5+
schedule:
6+
timezone: UTC
7+
interval: weekly
8+
time: "11:00"
9+
open-pull-requests-limit: 5
10+
commit-message:
11+
prefix: "chore"
12+
include: "scope"

.github/workflows/elixir.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
# Step: Define how to cache deps. Restores existing cache if present.
4545
- name: Cache deps
4646
id: cache-deps
47-
uses: actions/cache@v3
47+
uses: actions/cache@v4
4848
with:
4949
path: |
5050
apps/**/deps
@@ -96,7 +96,7 @@ jobs:
9696
# Step: Define how to cache deps. Restores existing cache if present.
9797
- name: Cache deps
9898
id: cache-deps
99-
uses: actions/cache@v3
99+
uses: actions/cache@v4
100100
env:
101101
cache-name: cache-elixir-deps-1
102102
with:
@@ -111,20 +111,16 @@ jobs:
111111
# Step: Create dialyzer .plt files if they're not present
112112
- name: Cache dialyzer plt files
113113
id: cache-plt
114-
uses: actions/cache@v3
114+
uses: actions/cache@v4
115115
with:
116116
path: "priv/plts"
117117
key: expert-plts-2-${{ env.DEFAULT_OTP }}-${{ env.DEFAULT_ELIXIR }}-${{ hashFiles('apps/**/mix.lock' ) }}-${{ github.run_id }}
118118
restore-keys: |
119119
expert-plts-2-${{ env.DEFAULT_OTP }}-${{ env.DEFAULT_ELIXIR }}-${{ hashFiles('apps/**/mix.lock') }}-
120120
expert-plts-2-${{ env.DEFAULT_OTP }}-${{ env.DEFAULT_ELIXIR }}-
121121
122-
# Step: Download project dependencies. If unchanged, uses
123-
# the cached version.
124122
- name: Install and compile dependencies
125-
run: |
126-
mix deps.get
127-
mix deps.compile --skip-umbrella-children
123+
run: make deps.compile.poncho
128124

129125
- name: Compile
130126
run: make compile.all
@@ -137,7 +133,7 @@ jobs:
137133
138134
- name: Run dialyzer
139135
run: |
140-
mix compile.protocols
136+
make compile.protocols.poncho
141137
make dialyzer.all
142138
143139
test:
@@ -181,7 +177,7 @@ jobs:
181177
# Step: Define how to cache deps. Restores existing cache if present.
182178
- name: Cache deps
183179
id: cache-deps
184-
uses: actions/cache@v3
180+
uses: actions/cache@v4
185181
with:
186182
path: |
187183
apps/**/deps
@@ -211,7 +207,7 @@ jobs:
211207
uses: docker/setup-buildx-action@v3
212208

213209
- name: Build integration runner
214-
uses: docker/build-push-action@v5
210+
uses: docker/build-push-action@v6
215211
with:
216212
context: .
217213
file: ./integration/Dockerfile

.github/workflows/lint-commit.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Lint Commit
2+
on:
3+
pull_request_target:
4+
types:
5+
- opened
6+
- reopened
7+
- synchronize
8+
- edited
9+
10+
jobs:
11+
commitlint:
12+
runs-on: ubuntu-latest
13+
name: commitlint
14+
15+
steps:
16+
- uses: actions/checkout@v4
17+
- uses: amannn/action-semantic-pull-request@v5
18+
env:
19+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20+
with:
21+
subjectPattern: ^(?![A-Z]).+$
22+

.github/workflows/nix.yml

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

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
version-type: strict
2020

2121
- name: Checkout code
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Cache deps
2525
id: cache-deps
26-
uses: actions/cache@v3
26+
uses: actions/cache@v4
2727
env:
2828
cache-name: cache-elixir-deps
2929
with:

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ expert_debug
2929
priv/plts
3030

3131
apps/forge/src/future_elixir_parser.erl
32+
33+
.DS_Store
34+
35+
.notes/

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ env.test:
1212
export MIX_ENV=test
1313

1414
deps.poncho:
15-
$(foreach dir, $(poncho_dirs), cd apps/$(dir) && mix deps.get && cd ../..;)
15+
$(foreach dir, $(poncho_dirs), cd apps/$(dir) && echo $(dir) && mix deps.get && cd ../..;)
16+
17+
clean.poncho:
18+
$(foreach dir, $(poncho_dirs), cd apps/$(dir) && echo $(dir) && mix clean && cd ../..;)
1619

1720
deps.compile.poncho: deps.poncho
1821
$(foreach dir, $(poncho_dirs), cd apps/$(dir) && mix deps.compile && cd ../..;)
@@ -39,4 +42,4 @@ dialyzer.poncho: compile.poncho compile.protocols.poncho
3942
$(foreach dir, $(poncho_dirs), cd apps/$(dir) && mix dialyzer && cd ../..;)
4043

4144
package:
42-
cd apps/server && mix package
45+
cd apps/expert && mix package

apps/engine/.formatter.exs

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,11 @@ current_directory = Path.dirname(__ENV__.file)
33

44
import_deps = [:forge]
55

6-
impossible_to_format = [
7-
Path.join([
8-
current_directory,
9-
"test",
10-
"fixtures",
11-
"compilation_errors",
12-
"lib",
13-
"compilation_errors.ex"
14-
]),
15-
Path.join([current_directory, "test", "fixtures", "parse_errors", "lib", "parse_errors.ex"])
16-
]
17-
186
locals_without_parens = [with_progress: 2, with_progress: 3, defkey: 2, defkey: 3, with_wal: 2]
197

208
[
219
locals_without_parens: locals_without_parens,
2210
export: [locals_without_parens: locals_without_parens],
2311
import_deps: import_deps,
24-
inputs:
25-
Enum.flat_map(
26-
[
27-
Path.join(current_directory, "*.exs"),
28-
Path.join(current_directory, "{lib,test}/**/*.{ex,exs}")
29-
],
30-
&Path.wildcard(&1, match_dot: true)
31-
) -- impossible_to_format
12+
inputs: ["*.exs", "{lib,test}/**/*.{ex,exs}"]
3213
]

0 commit comments

Comments
 (0)