Skip to content

Commit aad6cac

Browse files
authored
fix: make package check pass (#9)
* fix: make package check pass * ci: cache EnergyPlus 23.1 in workflows * fix: preserve internal gain minimum semantics
1 parent 03c5330 commit aad6cac

15 files changed

Lines changed: 769 additions & 182 deletions

.Rbuildignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
^LICENSE\.md$
1111
^README\.Rmd$
1212

13-
^test/testthat/fixture/*[.]accdb$
14-
^test/testthat/fixture/*[.]laccdb$
15-
^test/testthat/fixture/*[.]sql$
13+
^tests/testthat/fixture/.*[.]accdb$
14+
^tests/testthat/fixture/.*[.]laccdb$
15+
^tests/testthat/fixture/.*[.]sql$
1616

1717
^cran-comments\.md$

.github/workflows/R-CMD-check.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,24 @@ jobs:
6767
extra-packages: any::rcmdcheck
6868
needs: check
6969

70+
- name: Cache EnergyPlus 23.1
71+
uses: actions/cache@v4
72+
with:
73+
path: |
74+
~/Applications/EnergyPlus-23-1-0
75+
~/.local/EnergyPlus-23-1-0
76+
~/AppData/Local/EnergyPlusV23-1-0
77+
key: ${{ runner.os }}-energyplus-23.1-portable-v1
78+
79+
- name: Install EnergyPlus 23.1
80+
run: |
81+
if (!eplusr::is_avail_eplus(23.1)) {
82+
eplusr::install_eplus(23.1, local = TRUE, portable = TRUE)
83+
}
84+
eplusr::use_eplus(23.1)
85+
stopifnot(file.exists(eplusr::path_eplus(23.1, "Energy+.idd", strict = TRUE)))
86+
shell: Rscript {0}
87+
7088
- uses: r-lib/actions/check-r-package@v2
7189
with:
7290
upload-snapshots: true

.github/workflows/pkgdown.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,24 @@ jobs:
3535
extra-packages: any::pkgdown, local::.
3636
needs: website
3737

38+
- name: Cache EnergyPlus 23.1
39+
uses: actions/cache@v4
40+
with:
41+
path: |
42+
~/Applications/EnergyPlus-23-1-0
43+
~/.local/EnergyPlus-23-1-0
44+
~/AppData/Local/EnergyPlusV23-1-0
45+
key: ${{ runner.os }}-energyplus-23.1-portable-v1
46+
47+
- name: Install EnergyPlus 23.1
48+
run: |
49+
if (!eplusr::is_avail_eplus(23.1)) {
50+
eplusr::install_eplus(23.1, local = TRUE, portable = TRUE)
51+
}
52+
eplusr::use_eplus(23.1)
53+
stopifnot(file.exists(eplusr::path_eplus(23.1, "Energy+.idd", strict = TRUE)))
54+
shell: Rscript {0}
55+
3856
- name: Build site
3957
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
4058
shell: Rscript {0}

.github/workflows/test-coverage.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,24 @@ jobs:
2929
extra-packages: any::covr
3030
needs: coverage
3131

32+
- name: Cache EnergyPlus 23.1
33+
uses: actions/cache@v4
34+
with:
35+
path: |
36+
~/Applications/EnergyPlus-23-1-0
37+
~/.local/EnergyPlus-23-1-0
38+
~/AppData/Local/EnergyPlusV23-1-0
39+
key: ${{ runner.os }}-energyplus-23.1-portable-v1
40+
41+
- name: Install EnergyPlus 23.1
42+
run: |
43+
if (!eplusr::is_avail_eplus(23.1)) {
44+
eplusr::install_eplus(23.1, local = TRUE, portable = TRUE)
45+
}
46+
eplusr::use_eplus(23.1)
47+
stopifnot(file.exists(eplusr::path_eplus(23.1, "Energy+.idd", strict = TRUE)))
48+
shell: Rscript {0}
49+
3250
- name: Test coverage
3351
run: |
3452
covr::codecov(

DESCRIPTION

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ RoxygenNote: 7.3.2
1212
SystemRequirements: mdbtools (<https://github.com/mdbtools/mdbtools>, required
1313
on macOS and Linux); Microsoft Access ODBC Driver on Windows
1414
Imports:
15+
cli,
1516
collapse(>= 2.1.0),
1617
data.table,
1718
DBI,
1819
eplusr,
20+
lubridate,
1921
odbc,
2022
RSQLite
2123
Suggests:

0 commit comments

Comments
 (0)