Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix C# gha errors #145

Merged
merged 67 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
403455a
temporarly disable R workflows
Felixmil Apr 25, 2024
011638b
add draft workflow for building/testing/commiting binaries
Felixmil Apr 25, 2024
209b1d0
fix name
Felixmil Apr 25, 2024
f7407f5
fix yaml
Felixmil Apr 25, 2024
004208b
fix yaml (again)
Felixmil Apr 25, 2024
db0f2ae
make linux-build job starting only after windows-build job is completed
Felixmil Apr 25, 2024
61eb981
modified checkout step
Felixmil Apr 25, 2024
0253247
try nuget
rwmcintosh May 9, 2024
b9f2696
add packagesdirectory
rwmcintosh May 9, 2024
683e07f
update dotnet sdk
rwmcintosh May 9, 2024
8ee2075
update build and test
rwmcintosh May 9, 2024
7539c76
c++ cannot build using dotnet build
rwmcintosh May 9, 2024
76242ef
try setting path
rwmcintosh May 9, 2024
bd6f79c
try setting path
rwmcintosh May 9, 2024
c474ca8
use enterprise
rwmcintosh May 9, 2024
1af038a
use msbuild instead
rwmcintosh May 9, 2024
bbedacd
not diagnostic
rwmcintosh May 9, 2024
5e1a67f
setup R
rwmcintosh May 9, 2024
518a9fe
change r path
rwmcintosh May 9, 2024
7af6d59
change r path
rwmcintosh May 9, 2024
180a328
log test crash
rwmcintosh May 9, 2024
8ebe2b0
skip failing test
rwmcintosh May 9, 2024
b1a6cb1
skip build when testing
rwmcintosh May 9, 2024
95d8e7b
specify test projects
rwmcintosh May 9, 2024
62b6922
test release builds
rwmcintosh May 9, 2024
fa3ed65
try another assembly test
rwmcintosh May 9, 2024
11c9c1a
Commit from GitHub Actions (build-c#-binaries)
github-actions[bot] May 9, 2024
897bfe0
try linux build
rwmcintosh May 9, 2024
0ba8702
Merge branch 'C#-gha-workflow' of github.com:Open-Systems-Pharmacolog…
rwmcintosh May 9, 2024
938e0bd
try linux build
rwmcintosh May 9, 2024
617ad02
fix path separator
rwmcintosh May 9, 2024
8f16089
build release
rwmcintosh May 9, 2024
d2374f1
install R
rwmcintosh May 9, 2024
f449b3e
allow registry test skipping
rwmcintosh May 9, 2024
d53a477
set R_HOME
rwmcintosh May 9, 2024
9d3c464
skip tests on Linux
rwmcintosh May 9, 2024
7060ead
remove dependency on newtonsoft
rwmcintosh May 9, 2024
edd6692
build before test
rwmcintosh May 9, 2024
2c0b0e9
build before test
rwmcintosh May 9, 2024
75663d5
fix dependencies
rwmcintosh May 9, 2024
77286fd
Commit from GitHub Actions (build-c#-binaries)
github-actions[bot] May 9, 2024
08e0e87
trigger R actions only after binaries were built
Felixmil May 13, 2024
d712174
Commit from GitHub Actions (build-c#-binaries)
github-actions[bot] May 13, 2024
df8fd5d
always test with latest r version
Felixmil May 13, 2024
bd026cf
add quotes around building action name
Felixmil May 13, 2024
7e8f495
Merge branch 'C#-gha-workflow' of https://github.com/Open-Systems-Pha…
Felixmil May 13, 2024
6824b4c
fix warning
Felixmil May 13, 2024
c7d34e0
Merge commit 'dc5a41367180e32b3377b894cbb93007ae69eea5'
Felixmil May 13, 2024
ec611ad
reorganize workflow using reusables wf
Felixmil May 14, 2024
79cefab
fix name
Felixmil May 14, 2024
7f22492
fix workflow names
Felixmil May 14, 2024
dd350fa
remove special character
Felixmil May 14, 2024
27b0f5d
add "needs" to run jobs sequentialy
Felixmil May 14, 2024
b801c3c
Commit from GitHub Actions (PR-Workflow)
github-actions[bot] May 14, 2024
6b4de43
fix warnings
Felixmil May 14, 2024
7363b38
add sequential execution for merge workflow
Felixmil May 14, 2024
863b615
Merge branch 'C#-gha-workflow' of https://github.com/Open-Systems-Pha…
Felixmil May 14, 2024
3fa7807
Commit from GitHub Actions (PR-Workflow)
github-actions[bot] May 14, 2024
442139d
trigger C# builds only of some C# code changed
Felixmil May 14, 2024
3a39bcb
Merge branch 'C#-gha-workflow' of https://github.com/Open-Systems-Pha…
Felixmil May 14, 2024
b358f19
trigger only if inst/lib/*.json file is changed (otherwise, is trigge…
Felixmil May 14, 2024
d6b6c98
Compare changes to latest commit (and not base branch)
Felixmil May 14, 2024
07f69f7
Revert "Compare changes to latest commit (and not base branch)"
Felixmil May 14, 2024
4034b21
Commit from GitHub Actions (PR-Workflow)
github-actions[bot] May 14, 2024
066f55b
remove change check for inst/lib/*.json
Felixmil May 14, 2024
cdc4bb7
Merge branch 'C#-gha-workflow' of https://github.com/Open-Systems-Pha…
Felixmil May 14, 2024
2613d73
Commit from GitHub Actions (PR-Workflow)
github-actions[bot] May 14, 2024
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
11 changes: 3 additions & 8 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
name: R-CMD-check

on:
push:
branches: [main]
workflow_run:
workflows: ["build-c#-binaries"]
types:
- completed
workflow_dispatch:
workflow_call:

name: R-CMD-check

jobs:
R-CMD-check:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/build-c#.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: build-c#-binaries

on:
pull_request:
branches: [main, master]
workflow_dispatch:
workflow_call:

name: build-c#-binaries

jobs:
Linux-Build:
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/merge-workflow.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Merge Workflow

on:
push:
branches:
- main
workflow_dispatch:


jobs:
R-CMD-Check:
uses: ./.github/workflows/R-CMD-check.yaml
test-coverage:
needs: [R-CMD-Check]
uses: ./.github/workflows/test-coverage.yaml
pkgdown:
needs: [R-CMD-Check]
uses: ./.github/workflows/pkgdown.yaml
12 changes: 3 additions & 9 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
on:
push:
branches: [main]
workflow_run:
workflows: ["build-c#-binaries"]
types:
- completed
workflow_dispatch:

name: pkgdown

on:
workflow_call:

jobs:
pkgdown:
runs-on: ubuntu-latest
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/pr-workflow.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: PR-Workflow

on:
pull_request:
branches:
- main
workflow_dispatch:


jobs:
# Detect changes done in C# code base. If no change were done, skim "build-Csharp-binaries" workflow.
changes:
runs-on: ubuntu-latest
permissions:
pull-requests: read
outputs:
Csharp: ${{ steps.filter.outputs.Csharp }}
steps:
- uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Csharp:
- 'shared/**'

build-Csharp-binaries:
needs: changes
if: ${{ needs.changes.outputs.Csharp == 'true' }}
uses: ./.github/workflows/build-c#.yaml
R-CMD-Check:
needs: build-Csharp-binaries
uses: ./.github/workflows/R-CMD-check.yaml
test-coverage:
needs: [build-Csharp-binaries, R-CMD-Check]
uses: ./.github/workflows/test-coverage.yaml
pkgdown:
needs: [build-Csharp-binaries, R-CMD-Check]
uses: ./.github/workflows/pkgdown.yaml
26 changes: 3 additions & 23 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
on:
push:
branches: [main]
workflow_run:
workflows: ["build-c#-binaries"]
types:
- completed
workflow_dispatch:

name: test-coverage

on:
workflow_call:

jobs:
test-coverage:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -43,17 +37,3 @@ jobs:
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
)
shell: Rscript {0}

- name: Show testthat output
if: always()
run: |
## --------------------------------------------------------------------
find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload test results
if: failure()
uses: actions/upload-artifact@v4
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
8 changes: 5 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# rSharp development version
# rSharp (development version)

- First release of the {`rSharp`} package.
- First release of the `{rSharp}` package.

## Minor improvements and bug fixes

- github actions implementation for windows and ubuntu builds.
- github actions implementation for windows and Ubuntu R package builds.
- github actions for C# binary builds for windows and Ubuntu.

<!--
## Breaking Changes
Expand All @@ -13,3 +14,4 @@


-->

3 changes: 2 additions & 1 deletion R/rSharp-env.R
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ rSharpEnv$testMethodBindingTypeName <- "ClrFacade.TestMethodBinding"
#' @export
rSharpSettingNames <- names(rSharpEnv)

#' Get the value of a global `{rShapr}` setting.
#' @title getRSharpSetting
#' @description Get the value of a global `{rSharp}` setting.
#'
#' @param settingName String name of the setting
#'
Expand Down
2 changes: 1 addition & 1 deletion R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
} else {
strings <- strsplit(system("ldd --version | grep ldd", intern = TRUE), " +")[[1]]
if (as.numeric(tail(strings, n = 1)) < 2.35) {
if (as.numeric(utils::tail(strings, n = 1)) < 2.35) {
stop("a suitable version of glibc was not found. Install glibc >= 2.35")
}
}
Expand Down
Binary file modified inst/extdata/rSharp.Examples.dll
Binary file not shown.
Binary file modified inst/lib/ClrFacade.dll
Binary file not shown.
Binary file modified inst/lib/DynamicInterop.dll
Binary file not shown.
Binary file modified inst/lib/RDotNet.dll
Binary file not shown.
Binary file modified inst/lib/rSharp.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions man/getRSharpSetting.Rd

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

Loading