Skip to content

Commit 23fcba7

Browse files
Merge branch 'main' into dependabot/github_actions/actions/cache-4
2 parents ce2736a + 9ad4107 commit 23fcba7

159 files changed

Lines changed: 26120 additions & 10987 deletions

File tree

Some content is hidden

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

.github/workflows/CI.yml

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,55 @@ jobs:
2525
matrix:
2626
version:
2727
- '1.11'
28+
- 'pre'
2829
os:
2930
- ubuntu-latest
3031
arch:
3132
- x64
3233
steps:
33-
- uses: actions/checkout@v4
34-
- uses: julia-actions/setup-julia@v1
34+
- uses: actions/checkout@v5
35+
- uses: julia-actions/setup-julia@v2
3536
with:
3637
version: ${{ matrix.version }}
3738
arch: ${{ matrix.arch }}
38-
- uses: actions/cache@v4
39-
env:
40-
cache-name: cache-artifacts
41-
with:
42-
path: ~/.julia/artifacts
43-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
44-
restore-keys: |
45-
${{ runner.os }}-test-${{ env.cache-name }}-
46-
${{ runner.os }}-test-
47-
${{ runner.os }}-
39+
- uses: julia-actions/cache@v2
4840
- uses: julia-actions/julia-buildpkg@v1
49-
- name: Run tests
50-
uses: julia-actions/julia-runtest@v1
51-
with:
52-
annotate: true
41+
- uses: julia-actions/julia-runtest@v1
5342
- uses: julia-actions/julia-processcoverage@v1
54-
- name: Upload results to Codecov
55-
uses: codecov/codecov-action@v5
43+
- uses: codecov/codecov-action@v5
5644
with:
45+
files: lcov.info
5746
token: ${{ secrets.CODECOV_TOKEN }}
47+
fail_ci_if_error: false
48+
docs:
49+
if: ${{ !contains(github.event.head_commit.message, 'skip ci') }}
50+
name: Documentation
51+
runs-on: ubuntu-latest
52+
permissions:
53+
actions: write # needed to allow julia-actions/cache to proactively delete old caches that it has created
54+
contents: write
55+
statuses: write
56+
steps:
57+
- uses: actions/checkout@v5
58+
- uses: julia-actions/setup-julia@v2
59+
with:
60+
version: '1'
61+
- uses: julia-actions/cache@v2
62+
- name: Configure doc environment
63+
shell: julia --project=docs --color=yes {0}
64+
run: |
65+
using Pkg
66+
Pkg.develop(PackageSpec(path=pwd()))
67+
Pkg.instantiate()
68+
- uses: julia-actions/julia-buildpkg@v1
69+
- uses: julia-actions/julia-docdeploy@v1
70+
env:
71+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72+
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
73+
- name: Run doctests
74+
shell: julia --project=docs --color=yes {0}
75+
run: |
76+
using Documenter: DocMeta, doctest
77+
using LineCableModels
78+
DocMeta.setdocmeta!(LineCableModels, :DocTestSetup, :(using LineCableModels); recursive=true)
79+
doctest(LineCableModels)

.github/workflows/create-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
contents: write
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616

1717
- name: Extract Changelog Section
1818
id: changelog

.github/workflows/make-docs.yml

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

.github/workflows/todo-to-issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
issues: write
1818
pull-requests: write
1919
steps:
20-
- uses: "actions/checkout@v4"
20+
- uses: "actions/checkout@v5"
2121
- name: "TODO to Issue"
2222
uses: "alstr/todo-to-issue-action@v5"
2323
env:

.gitignore

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Manifest.toml
2727

2828
# the hidden folder of shame
2929
temp/
30+
@INPROGRESS/
3031

3132
# Internal files
3233
dev
@@ -41,4 +42,12 @@ confidential/
4142
!.vscode/tasks.json
4243
onelab
4344
showcase
44-
!showcase/*.jl
45+
!showcase/*.jl
46+
papers
47+
sprint
48+
*/fem_output
49+
.github/*.md
50+
.github/instructions
51+
.github/prompts
52+
test/jl_*
53+
*.sh

.vscode/settings.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
{
2-
"julia.environmentPath": "/home/amartins/Documents/KUL/LineCableModels/dev"
2+
"files.exclude": {
3+
"**/.github": true,
4+
"**/.vscode": true,
5+
"**/@INPROGRESS": true,
6+
"**/docs": true,
7+
"**/examples": true,
8+
"**/test": true
9+
}
310
}

.vscode/tasks.json

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"panel": "new",
77
"reveal": "always"
88
},
9-
"command": "julia --project=test -e 'include(\"test/runtests.jl\")'",
9+
"command": "julia --project=. -e \"using Pkg; Pkg.test()\"",
1010
"problemMatcher": [],
1111
"type": "shell",
1212
"group": {
@@ -23,7 +23,7 @@
2323
"clear": true,
2424
"close": true
2525
},
26-
"command": "julia --project -e 'include(\"docs/setup.jl\"); include(\"docs/make.jl\")'",
26+
"command": "cd docs && julia --project=. -e \"using Pkg; Pkg.develop(PackageSpec(path=\\\"..\\\")); Pkg.instantiate()\" && julia --project=. make.jl",
2727
"options": {
2828
"cwd": "${workspaceFolder}"
2929
},
@@ -35,15 +35,18 @@
3535
}
3636
},
3737
{
38-
"label": "⚙️ Redefine All Environments",
38+
"label": "🧹 Clean Documentation",
3939
"presentation": {
4040
"panel": "new",
4141
"showReuseMessage": false,
4242
"reveal": "always",
4343
"clear": true,
4444
"close": true
4545
},
46-
"command": "julia -e 'include(\"setup.jl\"); setup_envs_only()'",
46+
"command": "rm -rf docs/build",
47+
"options": {
48+
"cwd": "${workspaceFolder}"
49+
},
4750
"problemMatcher": [],
4851
"type": "shell",
4952
"group": {
@@ -52,21 +55,13 @@
5255
}
5356
},
5457
{
55-
"label": "🔧 Setup VSCode Configuration",
56-
"presentation": {
57-
"panel": "new",
58-
"showReuseMessage": false,
59-
"reveal": "always",
60-
"clear": true,
61-
"close": true
62-
},
63-
"command": "julia -e 'include(\"setup.jl\"); setup_vscode_only()'",
64-
"problemMatcher": [],
65-
"type": "shell",
66-
"group": {
67-
"kind": "build",
68-
"isDefault": false
69-
}
58+
"label": "📂 Open Julia config folder",
59+
"type": "process",
60+
"command": "xdg-open", // Use "open" on macOS, "explorer" on Windows
61+
"args": [
62+
"${env:HOME}/.julia/config/"
63+
],
64+
"problemMatcher": []
7065
}
7166
],
7267
"version": "2.0.0"

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515

1616
### Added
1717

18+
- Included interface to run finite element simulations using [Onelab](https://onelab.info/).
19+
1820
- Included basic coverage tests.
1921

2022
- Included import/export of CableDesigns to JSON files.

Project.toml

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,28 @@ DisplayAs = "0b91fe84-8a4c-11e9-3e1d-67c38462b6d6"
1515
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
1616
EzXML = "8f5d6c58-4d21-5cfd-889c-e3ad7ee6a615"
1717
ForceImport = "9dda63f9-cce7-5873-89fa-eccbb2fffcde"
18+
Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
19+
GetDP = "dbfd83e6-7aba-450b-9c2b-93ccd973023a"
1820
Gmsh = "705231aa-382f-11e9-3f0c-b7cb4346fdeb"
1921
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
2022
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
23+
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
24+
LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36"
25+
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
2126
Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
2227
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
28+
PkgTemplates = "14b8a8f1-9102-5b29-a752-f990bacb7fe1"
2329
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
2430
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
31+
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
2532
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
2633
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
2734
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
2835
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
2936

37+
[sources]
38+
GetDP = {rev = "main", url = "https://github.com/Electa-Git/GetDP.jl"}
39+
3040
[compat]
3141
CSV = "0.10.15"
3242
ColorSchemes = "3.27.1"
@@ -38,46 +48,30 @@ DisplayAs = "0.1.6"
3848
DocStringExtensions = "0.9.3"
3949
EzXML = "1.2.0"
4050
ForceImport = "0.0.3"
51+
Functors = "0.5.2"
4152
Gmsh = "0.3.1"
42-
HypertextLiteral = "0.9.5"
4353
JSON3 = "1.14.2"
4454
LinearAlgebra = "1.11.0"
55+
Logging = "1.11.0"
56+
LoggingExtras = "1.1.0"
57+
MacroTools = "0.5.16"
4558
Measurements = "2.11.0"
4659
Pkg = "1.11.0"
60+
PkgTemplates = "0.7.56"
4761
PlotlyJS = "0.18.15"
4862
Plots = "1.40.9"
63+
Printf = "1.11.0"
4964
Reexport = "1.2.2"
50-
Revise = "3.7.2"
5165
Serialization = "1.11.0"
5266
SpecialFunctions = "2.5.0"
5367
Statistics = "1.11.1"
68+
TestItemRunner = "1.1.0"
5469

5570
[extras]
56-
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
57-
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
58-
Changelog = "5217a498-cd5d-4ec6-b8c2-9b85a09b6e3e"
5971
Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037"
60-
DisplayAs = "0b91fe84-8a4c-11e9-3e1d-67c38462b6d6"
61-
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
62-
DocumenterCitations = "daee34ce-89f3-4625-b898-19384cb65244"
63-
Infiltrator = "5903a43b-9cc3-4c30-8d17-598619ec4e9b"
64-
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
65-
JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
66-
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
67-
LocalRegistry = "89398ba2-070a-4b16-a995-9893c55d93cf"
68-
PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
69-
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
70-
Pluto = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
71-
PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
72-
ProfileView = "c46f51b8-102a-5cf2-8d2c-8597cb0e0da7"
73-
Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
7472
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
75-
SymSpellChecker = "bb1b64e9-0ccc-445c-80cb-5313b9f7dfe1"
7673
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
7774
TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
78-
HypertextLiteral = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
7975

8076
[targets]
81-
dev = ["ArgParse", "BenchmarkTools", "Infiltrator", "JET", "JuliaFormatter", "LocalRegistry", "ProfileView", "Revise", "SymSpellChecker", "TestItemRunner"]
82-
docs = ["Pluto", "PlutoUI", "Changelog", "DisplayAs", "Documenter", "DocumenterCitations", "Literate", "HypertextLiteral", "DataFrames", "Plots", "PlotlyJS", "JSON3"]
83-
test = ["Test", "Coverage"]
77+
test = ["Test", "Coverage", "SafeTestsets", "TestItemRunner"]

0 commit comments

Comments
 (0)