Skip to content

Commit

Permalink
Merge branch 'main' into fix-failing-shiny-test
Browse files Browse the repository at this point in the history
  • Loading branch information
cicdguy authored Apr 9, 2024
2 parents b068da2 + 301013d commit af28137
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 6 deletions.
25 changes: 24 additions & 1 deletion .github/workflows/build-check-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,18 @@ on:
required: false
type: string
default: ""
enable-sd:
description: |
Whether the installation of package dependencies via staged.dependencies should be enabled.
required: false
type: boolean
default: true
update-r-packages:
description: |
Whether R packages installed in the container should be updated to their latest version from CRAN/BioC.
required: false
type: boolean
default: false

concurrency:
group: r-cmd-${{ inputs.concurrency-group }}-${{ github.event.pull_request.number || github.ref }}
Expand Down Expand Up @@ -296,11 +308,13 @@ jobs:
junit_xml_comparison_input="${{ inputs.junit-xml-comparison }}"
junit_xml_positive_threshold="${{ inputs.junit-xml-positive-threshold }}"
junit_xml_negative_threshold="${{ inputs.junit-xml-negative-threshold }}"
enable_sd="${{ inputs.enable-sd }}"
echo "junit_xml_storage=${junit_xml_storage_input:-_junit_xml_reports}" >> $GITHUB_ENV
echo "junit_xml_diff_branch=${junit_xml_diff_branch_input:-main}" >> $GITHUB_ENV
echo "junit_xml_comparison=${junit_xml_comparison_input:-true}" >> $GITHUB_ENV
echo "junit_xml_positive_threshold=${junit_xml_positive_threshold:-1.0}" >> $GITHUB_ENV
echo "junit_xml_negative_threshold=${junit_xml_negative_threshold:-1.0}" >> $GITHUB_ENV
echo "enable_sd=${enable_sd:-true}" >> $GITHUB_ENV
shell: bash

- name: Restore npm cache 💰
Expand Down Expand Up @@ -338,8 +352,17 @@ jobs:
key: sd-${{ runner.os }}-${{ github.event.repository.name }}
path: ~/.staged.dependencies

- name: Update R packages 🗓️
if: >-
inputs.update-r-packages == true
run: |
update.packages()
shell: Rscript {0}

- name: Run Staged dependencies 🎦
if: inputs.install-deps-from-package-repositories == ''
if: >-
env.enable_sd == 'true'
&& inputs.install-deps-from-package-repositories == ''
uses: insightsengineering/staged-dependencies-action@v1
env:
GITHUB_PAT: ${{ steps.github-token.outputs.token }}
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# R specific hooks: https://github.com/lorenzwalthert/precommit
repos:
- repo: https://github.com/lorenzwalthert/precommit
rev: v0.4.0
rev: v0.4.1
hooks:
- id: style-files
args: [--style_pkg=styler, --style_fun=tidyverse_style]
Expand Down Expand Up @@ -51,7 +51,7 @@ repos:
hooks:
- id: prettier
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-added-large-files
args: ["--maxkb=200"]
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: r.pkg.template
Title: R Package Template
Version: 0.1.0.9149
Date: 2024-03-21
Version: 0.1.0.9150
Date: 2024-04-09
Authors@R:
person("insightsengineering", , , "[email protected]", role = c("aut", "cre"))
Description: R package template with GitHub Actions workflows included.
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# r.pkg.template 0.1.0.9149
# r.pkg.template 0.1.0.9150

### New features

Expand Down

0 comments on commit af28137

Please sign in to comment.