Skip to content

Commit

Permalink
Merge pull request #123 from jhollway/develop
Browse files Browse the repository at this point in the history
Fixed issues for CRAN submission and pushrelease actions
  • Loading branch information
jhollway authored May 3, 2022
2 parents 65b733a + c63fa13 commit c2ee2c6
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 16 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/pushrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,10 @@ jobs:
- name: Setup tinytex
uses: r-lib/actions/setup-tinytex@master

- name: Install X11 dependencies on MacOS
run: |
brew --cask install xquartz
- name: Query dependencies
run: |
install.packages('remotes')
Expand Down
6 changes: 2 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Description: A set of tools for writing documents
The package includes additional functions for institutional color palettes,
an institutional 'ggplot' theme, a function for counting manuscript words,
and a bibliographical analysis toolkit.
Date: 2022-04-29
Version: 0.9.1
Date: 2022-05-03
Version: 0.9.2
Authors@R:
c(person(given = "James",
family = "Hollway",
Expand Down Expand Up @@ -58,9 +58,7 @@ Suggests:
knitr,
DT,
leaflet,
rmarkdown,
remotes,
modelsummary,
kableExtra,
gt
VignetteBuilder: knitr
12 changes: 12 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# iheiddown 0.9.2

## Package updates:

- Fixed case-sensitive path extension for Linux checks in various vignettes
- Fixed various issues in the `pushrelease` workflow
- Release action was fixed by updating tag creation action
- Setup-R action was updated to v2
- Installing XQuartz dependency for macOS runner building the website since
the latest version of `{pdftools}` requires it
- Packages used in GitHub Actions were moved to Suggests in DESCRIPTION

# iheiddown 0.9.1

## Package updates:
Expand Down
5 changes: 3 additions & 2 deletions cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
0 errors | 0 warnings | 0 notes

- Fixed issues linked to incoming warnings
- Changed package description to avoid words not in the dictionary
- Updated a number of URLs to their new locations
- Updated a number of URLs to those with certificate verification
- Avoided .png/.PNG naming issue

File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions vignettes/presentations.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ a new R-Markdown file. To do this click on the "plus file" logo in the top left
corner and then on "R-Markdown".

```{r, echo = FALSE, out.width="80%", fig.cap="Step 1: Open a project"}
knitr::include_graphics("images/presentations/0-Open_Project.PNG", dpi = 144)
knitr::include_graphics("images/presentations/0-OpenProject.png", dpi = 144)
```

After you have done this, a little pop-up helper will appear. The first thing we
Expand All @@ -81,7 +81,7 @@ click on the "From Template" option on the left and select the
on "OK".

```{r, echo = FALSE, out.width="80%", fig.cap="Step 2: Select a template"}
knitr::include_graphics("images/presentations/1-Select_Template.PNG", dpi = 144)
knitr::include_graphics("images/presentations/1-SelectTemplate.png", dpi = 144)
```

Congrats! You just created your first presentation!
Expand Down
2 changes: 1 addition & 1 deletion vignettes/problemset.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ the following software:

1. Install [R](https://cran.r-project.org) and [R-Studio](https://www.rstudio.com/)
2. Install a LATEX distribution:
- [For MacOS](https//www.tug.org/mactex/)
- [For MacOS](https://www.tug.org/mactex/)
- [For Windows](https://miktex.org/)
- [For Linux](https://www.tug.org/texlive/)
3. Install `{iheiddown}` by typing the following command
Expand Down
6 changes: 3 additions & 3 deletions vignettes/syllabus.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ the following software:

1. Install [R](https://cran.r-project.org) and [R-Studio](https://www.rstudio.com/)
2. Install a LATEX distribution:
- [For MacOS](http://www.tug.org/mactex/)
- [For MacOS](https://www.tug.org/mactex/)
- [For Windows](https://miktex.org/)
- [For Linux](https://www.tug.org/texlive/)
3. Install `{iheiddown}` by typing the following command
Expand All @@ -55,7 +55,7 @@ a new R-Markdown file. To do this click on the "plus file" logo in the top left
corner and then on "R-Markdown".

```{r, echo = FALSE, out.width="80%", fig.cap="Step 1: Open a project"}
knitr::include_graphics("images/syllabus/0-Open_Project.PNG", dpi = 144)
knitr::include_graphics("images/syllabus/0-OpenProject.png", dpi = 144)
```

After you have done this, a little pop-up helper will appear. The first thing we
Expand All @@ -65,7 +65,7 @@ click on the "From Template" option on the left and select the
on "OK".

```{r, echo = FALSE, out.width="80%", fig.cap="Step 2: Select a template"}
knitr::include_graphics("images/syllabus/1-Create_Syllabus.PNG", dpi = 144)
knitr::include_graphics("images/syllabus/1-CreateSyllabus.png", dpi = 144)
```
Congrats! You just created your first syllabus! We can actually already render
our syllabus. This is done by simply clicking the "knit button" while viewing
Expand Down
8 changes: 4 additions & 4 deletions vignettes/thesis.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ knitr::opts_chunk$set(
collapse = TRUE,
comment = "#>",
fig.align = 'center',
fig.width=6,
fig.height=4
fig.width = 6,
fig.height = 4
)
```

Expand Down Expand Up @@ -60,7 +60,7 @@ a new R-Markdown file. To do this click on the "plus file" logo in the top left
corner and then on "R-Markdown".

```{r, echo = FALSE, out.width="80%", fig.cap="Step 1: Open a project"}
knitr::include_graphics("images/thesis/0-Open_Project.PNG", dpi = 144)
knitr::include_graphics("images/thesis/0-OpenProject.png", dpi = 144)
```

After you have done this, a little pop-up helper will appear. The first thing we
Expand All @@ -75,7 +75,7 @@ our `{bookdown}` based rendering function. Don't worry though, you can rename
the folder to your project name after creating it.

```{r, echo = FALSE, out.width="80%", fig.cap="Step 2: Select a template"}
knitr::include_graphics("images/thesis/1-Create_Thesis.PNG", dpi = 144)
knitr::include_graphics("images/thesis/1-CreateThesis.png", dpi = 144)
```

Congrats! You just created your first thesis project!
Expand Down

0 comments on commit c2ee2c6

Please sign in to comment.