Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
70a50aa
Run devtools::document() and merge with main branch in smoke test
krlmlr Dec 18, 2021
ea6c834
Oops
krlmlr Dec 18, 2021
1b7b9c1
Fetch
krlmlr Dec 18, 2021
7007d64
Merge with origin
krlmlr Dec 18, 2021
e992332
Revert "REVERT ME: Remove dep"
krlmlr Dec 18, 2021
c6d9274
Push
krlmlr Dec 18, 2021
e5eb9a1
Debug
krlmlr Dec 18, 2021
4ab3895
Auto-update
krlmlr Dec 18, 2021
3f12557
Declare output
krlmlr Dec 18, 2021
de24085
Log
krlmlr Dec 18, 2021
10361ce
Auto-update
krlmlr Dec 18, 2021
85fb073
With output
krlmlr Dec 18, 2021
1dd5a32
Reverse
krlmlr Dec 18, 2021
c0ae968
Needs
krlmlr Dec 18, 2021
fae3007
Auto-update
krlmlr Dec 18, 2021
43387c6
rev-parse
krlmlr Dec 18, 2021
d30f635
Auto-update
krlmlr Dec 18, 2021
bfbfef8
Extract to separate action
krlmlr Dec 18, 2021
2295d19
Auto-update
krlmlr Dec 18, 2021
4465cf4
Set id
krlmlr Dec 18, 2021
de574ad
Auto-update
krlmlr Dec 18, 2021
1a766cc
roxygenize and style
krlmlr Dec 18, 2021
55d3864
Remove
krlmlr Dec 18, 2021
f300169
Remove debug
krlmlr Dec 18, 2021
b746a72
Un-set
krlmlr Dec 18, 2021
5c32b57
Debug
krlmlr Dec 18, 2021
8bfc80e
REVERT ME: Don't style for now
krlmlr Dec 18, 2021
1bc2d8a
git-identity
krlmlr Dec 18, 2021
cc431be
Auto-update
krlmlr Dec 18, 2021
36781af
Revert "Auto-update"
krlmlr Dec 18, 2021
20126fc
More verbose message
krlmlr Dec 18, 2021
b6d1e73
Add pkg.lock to .gitignore
krlmlr Dec 18, 2021
8e33667
Revert "REVERT ME: Don't style for now"
krlmlr Dec 18, 2021
fa4a60a
Quote
krlmlr Dec 18, 2021
cfd1726
Better run URL
krlmlr Dec 18, 2021
c5318fd
Config
krlmlr Dec 18, 2021
da5ccdb
Debug
krlmlr Dec 18, 2021
e013f94
Un-id
krlmlr Dec 18, 2021
7d59054
Strict
krlmlr Dec 18, 2021
ee12dda
Kebap
krlmlr Dec 18, 2021
96849da
bash
krlmlr Dec 18, 2021
e19193b
Auto-update from GitHub Actions\n\nRun: https://github.com/r-dbi/RKaz…
krlmlr Dec 18, 2021
27f3524
Bump
krlmlr Dec 18, 2021
7e9ddb2
Syntax
krlmlr Dec 18, 2021
53a336f
Verbose
krlmlr Dec 18, 2021
c755255
Fix
krlmlr Dec 18, 2021
d93ad3c
Auto-update from GitHub Actions\n\nRun: https://github.com/r-dbi/RKaz…
krlmlr Dec 18, 2021
89397aa
Kill
krlmlr Dec 18, 2021
dfa4790
Finer
krlmlr Dec 18, 2021
9ce7194
Auto-update from GitHub Actions\n\nRun: https://github.com/r-dbi/RKaz…
krlmlr Dec 18, 2021
09b2921
Un-debug
krlmlr Dec 18, 2021
0e83200
Cache
krlmlr Dec 18, 2021
c256853
Ignore
krlmlr Dec 18, 2021
2201457
Indent
krlmlr Dec 18, 2021
64795f4
strict
krlmlr Dec 18, 2021
9fa2880
Un-style
krlmlr Dec 18, 2021
1359875
Merge remote-tracking branch 'origin/main' into f-document
krlmlr Dec 18, 2021
2c0b6a4
Auto-update from GitHub Actions\n\nRun: https://github.com/r-dbi/RKaz…
krlmlr Dec 18, 2021
f4f6d11
Newline
krlmlr Dec 18, 2021
b661397
Revert "Auto-update from GitHub Actions\n\nRun: https://github.com/r-…
krlmlr Dec 18, 2021
43c429d
Auto-update from GitHub Actions
krlmlr Dec 18, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/pkg.lock
20 changes: 20 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ name: rcc
jobs:
R-CMD-check-smoke:
runs-on: ubuntu-latest
outputs:
sha: ${{ steps.commit.outputs.sha }}

name: "Smoke test: stock R"

Expand All @@ -36,23 +38,35 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}

- uses: ./.github/workflows/git-identity

- uses: ./.github/workflows/custom/before-install

- uses: ./.github/workflows/install
with:
token: ${{ secrets.GITHUB_TOKEN }}
install-r: false
cache-version: rcc-smoke-1
extra-packages: rcmdcheck roxygen2 styler

- uses: ./.github/workflows/custom/after-install

- uses: ./.github/workflows/roxygenize

- uses: ./.github/workflows/style

- id: commit
uses: ./.github/workflows/commit

- uses: ./.github/workflows/check
with:
results: ${{ runner.os }}-smoke-test

# Runs in a separate workflow, because it's using dev pkgdown
# which might bring in other dev dependencies
pkgdown:
needs: R-CMD-check-smoke

runs-on: ubuntu-latest

name: "pkgdown"
Expand All @@ -62,6 +76,8 @@ jobs:

steps:
- uses: actions/checkout@v2
with:
ref: ${{ needs.rcc-smoke.outputs.sha }}

- uses: ./.github/workflows/rate-limit
with:
Expand Down Expand Up @@ -112,6 +128,8 @@ jobs:

steps:
- uses: actions/checkout@v2
with:
ref: ${{ needs.rcc-smoke.outputs.sha }}

- uses: ./.github/workflows/custom/before-install

Expand Down Expand Up @@ -167,6 +185,8 @@ jobs:

steps:
- uses: actions/checkout@v2
with:
ref: ${{ needs.rcc-smoke.outputs.sha }}

- uses: ./.github/workflows/custom/before-install

Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/commit/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: 'Action to commit changes to the repository'
outputs:
sha:
description: "SHA of generated commit"
value: ${{ steps.commit.outputs.sha }}

runs:
using: "composite"
steps:
- name: Commit if changed
id: commit
run: |
set -x
if [ -n "$(git status --porcelain)" ]; then
echo "Changed"
git fetch
if [ -n "${GITHUB_HEAD_REF}" ]; then
git add .
git stash save
git switch ${GITHUB_HEAD_REF}
git merge origin/${GITHUB_BASE_REF} --no-edit
git stash pop
fi
git add .
git commit -m "Auto-update from GitHub Actions"$'\n'$'\n'"Run: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
git push
echo ::set-output name=sha::$(git rev-parse HEAD)
fi
shell: bash
8 changes: 8 additions & 0 deletions .github/workflows/install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,14 @@ runs:
extra-packages: ${{ inputs.extra-packages }} ${{ matrix.config.covr && 'covr' }}
cache-version: ${{ inputs.cache-version }}

- name: Add pkg.lock to .gitignore
run: |
set -x
if ! [ -f .github/.gitignore ] || [ -z "$(grep '^/pkg.lock$' .github/.gitignore)" ]; then
echo /pkg.lock >> .github/.gitignore
fi
shell: bash

- name: Add fake qpdf and checkbashisms
if: runner.os == 'Linux'
run: |
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/roxygenize/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: 'Action to create documentation with roxygen2'

runs:
using: "composite"
steps:
- name: Roxygenize
run: |
roxygen2::roxygenize()
shell: Rscript {0}
37 changes: 37 additions & 0 deletions .github/workflows/style/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: 'Action to auto-style a package'

runs:
using: "composite"
steps:
- name: Check styler options
id: check
run: |
set -x
scope=$(grep Config/autostyle/scope DESCRIPTION | cut -d " " -f 2)
strict=$(grep Config/autostyle/strict DESCRIPTION | cut -d " " -f 2)
echo ::set-output name=scope::$scope
echo ::set-output name=strict::$strict
shell: bash

- name: Enable styler cache
if: ${{ steps.check.outputs.scope }}
run: |
styler::cache_activate(verbose = TRUE)
shell: Rscript {0}

- uses: actions/cache@v2
if: ${{ steps.check.outputs.scope }}
with:
path: |
~/.cache/R/R.cache
key: ${{ runner.os }}-

- name: Run styler
if: ${{ steps.check.outputs.scope }}
run: |
strict <- as.logical("${{ steps.check.outputs.strict }}")
if (is.na(strict)) {
strict = FALSE
}
styler::style_pkg(scope = "${{ steps.check.outputs.scope }}", strict = strict)
shell: Rscript {0}
2 changes: 2 additions & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ Collate:
'show_KazamConnection.R'
'show_KazamDriver.R'
'show_KazamResult.R'
Config/autostyle/scope: line_breaks
Config/autostyle/strict: false
1 change: 0 additions & 1 deletion R/Connection.R
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,3 @@ DBI::dbListObjects

#' @export
DBI::dbWithTransaction

1 change: 0 additions & 1 deletion R/Driver.R
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,3 @@ DBI::dbCanConnect

#' @export
DBI::Id

1 change: 0 additions & 1 deletion R/RKazam.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
#' @details TBD.
"_PACKAGE"

1 change: 0 additions & 1 deletion R/Result.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ setClass(
statement = "character"
)
)

10 changes: 1 addition & 9 deletions man/DBI.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions tests/testthat/test-DBItest.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
if (identical(Sys.getenv("NOT_CRAN"), "true")) {

DBItest::test_all()

}