From a24517d057237b92e423912767e3687c6af86d54 Mon Sep 17 00:00:00 2001 From: Abel Soares Siqueira Date: Tue, 23 Jan 2024 11:55:56 +0100 Subject: [PATCH] Fix running codecov only on ubuntu-latest for Julia 1 (#423) * Fix running codecov only on ubuntu-latest for Julia 1 * Reorganize package usage in main file * [squash] Use single quotes --- .github/workflows/Test.yml | 4 ++-- .github/workflows/TestOnPR.yml | 2 ++ src/TulipaEnergyModel.jl | 27 ++++++++++++++------------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index d1a3a9d6..7daeb0f1 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -48,8 +48,8 @@ jobs: - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 - uses: julia-actions/julia-processcoverage@v1 - if: ${{ matrix.version }} == "1" && ${{ matrix.os }} == "ubuntu-latest" + if: matrix.version == '1' && matrix.os == 'ubuntu-latest' - uses: codecov/codecov-action@v3 - if: ${{ matrix.version }} == "1" && ${{ matrix.os }} == "ubuntu-latest" + if: matrix.version == '1' && matrix.os == 'ubuntu-latest' with: files: lcov.info diff --git a/.github/workflows/TestOnPR.yml b/.github/workflows/TestOnPR.yml index 79f734ee..555ebeb0 100644 --- a/.github/workflows/TestOnPR.yml +++ b/.github/workflows/TestOnPR.yml @@ -38,6 +38,8 @@ jobs: - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 - uses: julia-actions/julia-processcoverage@v1 + if: matrix.version == '1' && matrix.os == 'ubuntu-latest' - uses: codecov/codecov-action@v3 + if: matrix.version == '1' && matrix.os == 'ubuntu-latest' with: files: lcov.info diff --git a/src/TulipaEnergyModel.jl b/src/TulipaEnergyModel.jl index ee7eb251..d8777b49 100644 --- a/src/TulipaEnergyModel.jl +++ b/src/TulipaEnergyModel.jl @@ -1,19 +1,20 @@ module TulipaEnergyModel # Packages -using CSV -using DataFrames -using Graphs -using HiGHS -using JuMP -using MathOptInterface -using MetaGraphsNext -using TOML -using Plots -using Colors -using GraphMakie -using GraphMakie.NetworkLayout -using CairoMakie + +## Data +using CSV, DataFrames, TOML + +## Graphs +using Graphs, MetaGraphsNext + +## Optimization +using HiGHS, JuMP, MathOptInterface + +## Plots +using Plots, Colors, GraphMakie, GraphMakie.NetworkLayout, CairoMakie + +## Others using TimerOutputs include("input-tables.jl")