Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ jobs:
uses: actions/cache@v4
with:
path: branch/node_modules
key: node_modules-${{ hashFiles('branch/package-lock.json') }}
key: node_modules-${{ hashFiles('branch/package-lock.json', 'branch/cli/package-lock.json') }}

# Re-use node_modules between runs until package-lock.json changes.
- name: Cache node_modules (main)
id: cache-node_modules-main
uses: actions/cache@v4
with:
path: main/node_modules
key: node_modules-${{ hashFiles('main/package-lock.json') }}
key: node_modules-${{ hashFiles('main/package-lock.json', 'main/cli/package-lock.json') }}

# Re-use ~/.elm between runs until elm.json or review/elm.json changes.
# The Elm compiler saves downloaded Elm packages to ~/.elm saves
Expand Down Expand Up @@ -113,18 +113,31 @@ jobs:

- name: Generate (branch)
working-directory: branch
run: npm run test:gen
run: |
# Change following line to just `npm -C cli ci` after #214 is merged
[ ! -d cli ] || npm -C cli ci
npm run test:gen

- name: Generate (main)
working-directory: main
run: npm run test:gen || true # We don't want to block on main failing to generate
run: |
# Change following line to just `npm -C cli ci` after #214 is merged
[ ! -d cli ] || npm -C cli ci
npm run test:gen || true # We don't want to block on main failing to generate

- name: Diff the outputs
run: |
main_folder=main/cli/generated
branch_folder=branch/cli/generated

# Remove the following two lines after #214 is merged
[ -d main/cli ] || main_folder=main/generated
[ -d branch/cli ] || branch_folder=branch/generated

echo '```diff' > diff.md
diff --ignore-all-space --minimal --new-file --recursive \
main/generated \
branch/generated | dd bs=1024 count=30 >> diff.md || true # We ignore diff exiting with a 1
"$main_folder" \
"$branch_folder" | dd bs=1024 count=30 >> diff.md || true # We ignore diff exiting with a 1
echo -e '\n```' >> diff.md

- name: Post a comment with the diff
Expand Down
75 changes: 75 additions & 0 deletions cli/elm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"type": "application",
"source-directories": [
"src",
"../src"
],
"elm-version": "0.19.1",
"dependencies": {
"direct": {
"dillonkearns/elm-cli-options-parser": "3.2.0",
"dillonkearns/elm-pages": "10.2.0",
"elm/core": "1.0.5",
"elm/json": "1.1.3",
"elm/regex": "1.0.0",
"elm/url": "1.0.0",
"elmcraft/core-extra": "2.1.0",
"json-tools/json-schema": "1.0.2",
"json-tools/json-value": "1.0.1",
"mdgriffith/elm-codegen": "5.2.0",
"miniBill/elm-fast-dict": "1.2.1",
"myrho/yaml": "1.0.0",
"turboMaCk/non-empty-list-alias": "1.4.0",
"wolfadex/elm-ansi": "3.0.0",
"wolfadex/elm-open-api": "2.0.0"
},
"indirect": {
"Chadtech/elm-bool-extra": "2.4.2",
"NoRedInk/elm-json-decode-pipeline": "1.0.1",
"avh4/elm-color": "1.0.0",
"danfishgold/base64-bytes": "1.1.0",
"danyx23/elm-mimetype": "4.0.1",
"dillonkearns/elm-bcp47-language-tag": "2.0.0",
"dillonkearns/elm-date-or-date-time": "2.0.0",
"dillonkearns/elm-form": "3.0.1",
"dividat/elm-semver": "2.0.0",
"elm/browser": "1.0.2",
"elm/bytes": "1.0.8",
"elm/file": "1.0.5",
"elm/html": "1.0.0",
"elm/http": "2.0.0",
"elm/parser": "1.1.0",
"elm/random": "1.0.0",
"elm/time": "1.0.0",
"elm/virtual-dom": "1.0.3",
"elm-community/basics-extra": "4.1.0",
"elm-community/json-extra": "4.3.0",
"elm-community/list-extra": "8.7.0",
"elm-community/maybe-extra": "5.3.0",
"fredcy/elm-parseint": "2.0.1",
"jluckyiv/elm-utc-date-strings": "1.0.0",
"justinmimbs/date": "4.1.0",
"miniBill/elm-codec": "2.2.0",
"miniBill/elm-unicode": "1.1.1",
"myrho/elm-parser-extras": "1.0.1",
"noahzgordon/elm-color-extra": "1.0.2",
"robinheghan/fnv1a": "1.0.0",
"robinheghan/murmur3": "1.0.0",
"rtfeldman/elm-css": "18.0.0",
"rtfeldman/elm-hex": "1.0.0",
"rtfeldman/elm-iso8601-date-strings": "1.1.4",
"stil4m/elm-syntax": "7.3.8",
"stil4m/structured-writer": "1.0.3",
"the-sett/elm-pretty-printer": "3.1.0",
"the-sett/elm-syntax-dsl": "6.0.3",
"zwilias/elm-utf-tools": "2.0.1"
}
},
"test-dependencies": {
"direct": {
"elm-explorations/test": "2.2.0",
"miniBill/elm-unicode": "1.1.1"
},
"indirect": {}
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
39 changes: 39 additions & 0 deletions cli/example/elm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"type": "application",
"source-directories": [
"src",
"../generated"
],
"elm-version": "0.19.1",
"dependencies": {
"direct": {
"cachix/elm-uuid": "2.0.0",
"danfishgold/base64-bytes": "1.1.0",
"elm/browser": "1.0.2",
"elm/bytes": "1.0.8",
"elm/core": "1.0.5",
"elm/http": "2.0.0",
"elm/json": "1.1.3",
"elm/parser": "1.1.0",
"elm/time": "1.0.0",
"elm/url": "1.0.0",
"elm-community/json-extra": "4.3.0",
"justinmimbs/date": "4.1.0",
"justinmimbs/time-extra": "1.2.0",
"wolfadex/elm-rfc3339": "2.0.0"
},
"indirect": {
"NoRedInk/elm-random-general": "1.0.0",
"NoRedInk/elm-random-pcg-extended": "1.0.0",
"elm/file": "1.0.5",
"elm/html": "1.0.0",
"elm/regex": "1.0.0",
"elm/virtual-dom": "1.0.3",
"rtfeldman/elm-iso8601-date-strings": "1.1.4"
}
},
"test-dependencies": {
"direct": {},
"indirect": {}
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading