Skip to content

Commit

Permalink
Merge pull request #106 from UofGAnalytics/rmarkdown-version-command
Browse files Browse the repository at this point in the history
add rmarkdown version to readme
  • Loading branch information
dmca-glasgow authored May 6, 2022
2 parents 49c4097 + af90ccd commit ddd2b16
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 8 deletions.
22 changes: 15 additions & 7 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
os: [ubuntu-latest, macos-latest, windows-latest]
node-version: [16.x]
r-version: [4.1.x]
python-version: [3.x]

steps:
# -----------------------
Expand Down Expand Up @@ -51,26 +52,33 @@ jobs:
- name: Cache Renv packages
uses: r-lib/actions/setup-renv@v2

# Python
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}

# Build release
- name: Build release
run: npm run build-release

- name: Link release
run: npm link ./release

# -----------------------
# SETUP -----------------
# TEST ------------------
# -----------------------

- run: npm run test
- name: Run tests
run: npm run test

# - run: |
# npm link
# cd fixtures/apm
# rmarkdown --week=2
# -----------------------
# WRAP UP ---------------
# -----------------------

- name: Upload artifacts
if: ${{ failure() }}
uses: actions/upload-artifact@main
with:
name: ${{ matrix.os }}-node${{ matrix.node-version }}-r${{ matrix.r-version }}-results
name: ${{ matrix.os }}-node${{ matrix.node-version }}-r${{ matrix.r-version }}-python${{ matrix.python-version }}-results
path: check
2 changes: 1 addition & 1 deletion compiler/src/knitr/__test__/knitr.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -333,5 +333,5 @@ describe('knitr', () => {
`);

expect(ignoreWhitespace(html)).toBe(result);
}, 60000);
}, 120000);
});
3 changes: 3 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ npm list –g --depth=0
> ...
> build-coursework@... -> ...github:UofGAnalytics/build-coursework...
> ...

rmarkdown --version
# 1.1.47 or similar
```

## Usage
Expand Down

0 comments on commit ddd2b16

Please sign in to comment.