diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 2f7759c..4055bf5 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -21,7 +21,7 @@ jobs: matrix: version: #- '1.0' - - '1.9' + - '1.10.3' #- 'nightly' os: - ubuntu-latest @@ -34,7 +34,9 @@ jobs: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - uses: julia-actions/cache@v1 - - name: Install TuLiPa Package - run: julia -e 'using Pkg; Pkg.add(url = "https://github.com/NVE/TuLiPa.git", rev = "redesign_JulES")' + - name: Add TuLiPa from GitHub URL + run: julia --project=@. -e 'using Pkg; Pkg.develop(PackageSpec(url = "https://github.com/NVE/TuLiPa.git"))' + - name: Instantiate Environment + run: julia --project=@. -e 'using Pkg; Pkg.instantiate()' - uses: julia-actions/julia-buildpkg@v1 - - uses: julia-actions/julia-runtest@v1 \ No newline at end of file + - uses: julia-actions/julia-runtest@v1 diff --git a/Project.toml b/Project.toml index 0704bf4..7eca464 100644 --- a/Project.toml +++ b/Project.toml @@ -23,11 +23,11 @@ ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" [compat] -julia = "1.9.2" +julia = "1.10.3" OrdinaryDiffEq = "6.66.0" ComponentArrays = "0.15.17" Interpolations = "0.16.1" JLD2 = "0.5.15" [extensions] -IfmExt = ["ComponentArrays", "Interpolations", "JLD2", "OrdinaryDiffEq"] \ No newline at end of file +IfmExt = ["ComponentArrays", "Interpolations", "JLD2", "OrdinaryDiffEq"] diff --git a/src/io.jl b/src/io.jl index d1e39a1..e40ba9b 100644 --- a/src/io.jl +++ b/src/io.jl @@ -1705,7 +1705,7 @@ function get_output_main_local() data["batnames"] = batterynames data["batmatrix"] = db.output.batterylevels - data["batindex"] = x2 + data["batindex"] = x1 data["statenames"] = db.output.statenames data["statematrix"] = permutedims(db.output.statematrix)