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

update #289

Merged
merged 69 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
22b399d
changes to the code
Vitalis95 Jul 16, 2024
01fe3fb
changes to the code
Vitalis95 Jul 17, 2024
107bcca
changes
Vitalis95 Jul 17, 2024
41e4b5e
changes
Vitalis95 Jul 17, 2024
4f42e53
changes to the code
Vitalis95 Jul 17, 2024
a18448c
changes to the code
Vitalis95 Jul 18, 2024
91c887b
changes
Vitalis95 Jul 29, 2024
8f5f841
changes
Vitalis95 Jul 31, 2024
baaffa5
Update data_object_R6.R
lilyclements Sep 23, 2024
af4a7d8
Merge pull request #279 from IDEMSInternational/master
Vitalis95 Sep 24, 2024
a85d005
changes
Vitalis95 Sep 24, 2024
20c187c
changes
Vitalis95 Sep 24, 2024
6cfface
Merge pull request #280 from lilyclements/anova_changes
Vitalis95 Sep 24, 2024
962c0b2
Adding total as parameter
lilyclements Sep 24, 2024
739793d
changes
Vitalis95 Sep 24, 2024
62e5f8f
Merge pull request #958 from Vitalis95/three_var_summaries
lilyclements Sep 24, 2024
05f7ec7
Update instat_object_R6 to have total = TRUE
lilyclements Sep 24, 2024
fe3001e
changes
Vitalis95 Sep 25, 2024
5e122d0
Merge pull request #281 from lilyclements/anova_changes
Vitalis95 Sep 25, 2024
494f5d5
Formatting Script
N-thony Sep 25, 2024
681034a
Changes to the code
Vitalis95 Sep 25, 2024
6770adb
Merge branch 'master' into format_code
N-thony Sep 25, 2024
d274d49
minor code change
N-thony Sep 25, 2024
8573f78
changes
Vitalis95 Sep 25, 2024
74ffcce
code addition
N-thony Sep 25, 2024
f900948
Remove format code menu
N-thony Sep 26, 2024
a7e61a1
Simplify the code
N-thony Sep 26, 2024
91715bb
minor code change
N-thony Sep 26, 2024
08e113c
removed try catch
N-thony Sep 26, 2024
69e9c5b
Version Number in the Frmmain code file
derekagorhom Sep 30, 2024
12a4055
Update instat/frmMain.vb
Patowhiz Sep 30, 2024
d98ccf8
Update instat/frmMain.vb
Patowhiz Sep 30, 2024
cc91a97
Tidying up anova_tables2 format
lilyclements Oct 9, 2024
a447e91
Update data_object_R6.R
lilyclements Oct 9, 2024
f9a6423
rounding off
Vitalis95 Oct 9, 2024
04a1d4a
Fixing sort_dataframe
lilyclements Oct 9, 2024
9ecd1d6
actually returning the model!
lilyclements Oct 9, 2024
83d0760
Merge pull request #9183 from Vitalis95/roundingoff
N-thony Oct 9, 2024
1f41ce9
Merge pull request #9184 from lilyclements/fixes_sort
N-thony Oct 9, 2024
c2bebb2
Amending anova_tables2 to print
lilyclements Oct 9, 2024
d3a4131
Update dlgDescribeTwoVariable.vb
lilyclements Oct 9, 2024
d0a52cd
Create release-build
ChrisMarsh82 Oct 11, 2024
e354c1a
Merge branch 'master' into format_code
N-thony Oct 11, 2024
8b3df7b
Update release-build
ChrisMarsh82 Oct 11, 2024
396a709
Create Rprofile.site
ChrisMarsh82 Oct 11, 2024
2f4f3f2
Update release-build
ChrisMarsh82 Oct 11, 2024
f0714f1
Merge pull request #9186 from IDEMSInternational/ChrisMarsh82-patch-3
ChrisMarsh82 Oct 11, 2024
4bdab88
Rename release-build to release-build.yml
ChrisMarsh82 Oct 11, 2024
069b60b
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
6c86c89
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
1c8744a
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
e2192d8
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
ccb77b0
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
b0ee63d
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
ec536df
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
1c600be
changes
Vitalis95 Oct 11, 2024
c216567
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
98169f6
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
56a137f
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
6ce2e9a
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
9bfb40f
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
d5d5857
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
c759b8d
Update release-build.yml
ChrisMarsh82 Oct 11, 2024
d6705b3
Merge pull request #9153 from N-thony/format_code
Patowhiz Oct 12, 2024
08d7357
General graphics
Fidel365 Oct 13, 2024
243f37e
Merge pull request #9074 from Vitalis95/three_var_summaries
N-thony Oct 14, 2024
6f03713
Merge pull request #9190 from Fidel365/generaldialog
N-thony Oct 14, 2024
e418e09
Code Changes
derekagorhom Oct 14, 2024
d757162
Merge pull request #9161 from derekagorhom/Version_num
Patowhiz Oct 15, 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
196 changes: 196 additions & 0 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@

name: Create Installers



on:
workflow_dispatch:
inputs:
major_version:
description: 'Major Version'
required: true
minor_version:
description: 'Minor Version'
required: true
revision_no:
description: 'Revision'
required: true
r-version:
description: 'Specify the R version to install'
required: true
default: '4.4.1' # Default version if the user does not specify

jobs:

build:

# running on 2019 so that .NET version 4.5 and lower can be used
runs-on: windows-2019

# set variables
env:
Solution_Name: Instat.sln
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}


# check out r-instat
steps:

- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
- name: Setup MSBuild.exe
uses: microsoft/[email protected]

# set up and restore NuGet packages
- name: Setup NuGet
uses: NuGet/[email protected]

- name: Restore NuGet
run: nuget restore $env:Solution_Name


# Restore the application to populate the obj folder with RuntimeIdentifiers
- name: Restore the application
run: msbuild $env:Solution_Name /t:Restore /p:Configuration=Release

# increment build number
- name: Generate build number
uses: einaregilsson/build-number@v3
with:
token: ${{secrets.github_token}}

#update version numbers in assembley
- name: set-version-assemblyinfo
uses: dannevesdantas/[email protected]
with:
# Folder location to search for AssemblyInfo.cs/.vb files
path: instat\My Project\AssemblyInfo.vb
# optional, default is ${{ github.workspace }}
# Version number to set on [AssemblyVersion] and [AssemblyFileVersion] attributes of AssemblyInfo.cs/.vb files
version: "${{ inputs.major_version }}.${{ inputs.minor_version }}.${{ inputs.revision_no }}.${env:BUILD_NUMBER}"

# Create the app package by building and packaging the Windows Application Packaging project
# 64bit
- name: Create the app package 64 bit
run: msbuild $env:Solution_Name /p:Configuration=Release /p:Platform=x64 /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
env:
Appx_Bundle: Always
Appx_Package_Build_Mode: StoreUpload
Configuration: ${{ matrix.configuration }}

# Build 64 bit installer without R
- name: Building the installer 64bit - No R
run: |
"%programfiles(x86)%\Inno Setup 6\iscc.exe" "inno_install_script_64bit.iss"
shell: cmd

# Upload 64 bit installer without R
- name: Upload the 64 bit installer as an artifact
uses: actions/upload-artifact@v4
if: ${{ github.event_name != 'pull_request' }}
with:
path: "Output/"
name: rinstat64NoR

- name: Remove 64 bit without R installer
run: |
del "Output/*"

# check out R-Instat Data
- name: Checkout Instat Data
uses: actions/checkout@v3
with:
repository: ' africanmathsinitiative/R-Instat-Data'
fetch-depth: 0
path: 'InstatData'

# Create directory and copy over InstatData (64bit)
- name: Make Library directory 64 bit
run: |
MKDIR instat\bin\x64\Release\static\Library\

- name: Copy R-Instat Data 64 bit
run: |
ROBOCOPY InstatData\data\ instat\bin\x64\Release\static\Library\ /E
continue-on-error: true

# Install R
- name: Set up R
uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ inputs.r-version }}

- name: Debug paths
run: |
$R_HOME=$(Rscript -e 'cat(R.home())')
echo "R_HOME path: $R_HOME"
echo "Source path: $(pwd)\installer\Rprofile.site"

- name: Update Rprofile.site
run: |
$R_HOME=$(Rscript -e 'cat(R.home())')
ROBOCOPY "${{ github.workspace }}\installer" "$R_HOME\etc" "Rprofile.site" /COPY:DAT
continue-on-error: true

- name: Copy R 64 bit
run: |
$R_HOME=$(Rscript -e 'cat(R.home())')
ROBOCOPY "$R_HOME" "${{ github.workspace }}\instat\bin\x64\Release\static\R" /E
continue-on-error: true

- name: Set R-tools
uses: r-windows/install-rtools@master

# Check if the directory exists
- name: Verify InstallPackages.R directory
run: |
if (Test-Path "D:\a\R-Instat\R-Instat\instat\static\InstatObject\R") {
Write-Host "Directory exists."
} else {
Write-Host "Directory does not exist."
}

# List the contents of the directory to check for the script
- name: List contents of InstatObject\R directory
run: |
Get-ChildItem "D:\a\R-Instat\R-Instat\instat\static\InstatObject\R"

# Check if the directory exists
- name: Verify script directory
run: |
if (Test-Path "D:\a\R-Instat\R-Instat\instat\bin\x64\Release\static\R") {
Write-Host "Directory exists."
} else {
Write-Host "Directory does not exist."
}

# List the contents of the directory to check for the script
- name: List contents of R\bin directory
run: |
Get-ChildItem "D:\a\R-Instat\R-Instat\instat\bin\x64\Release\static"
- name: List contents of R\bin directory
run: |
Get-ChildItem "D:\a\R-Instat\R-Instat\instat\bin\x64\Release\static\R"

- name: Install R packages (64 bit)
run: |
"${{ github.workspace }}\instat\bin\x64\Release\static\R\bin\Rscript.exe" "${{ github.workspace }}\instat\static\InstatObject\R\InstallPackages.R"
shell: cmd

- name: Building the installer 64bit - With R
run: |
"%programfiles(x86)%\Inno Setup 6\iscc.exe" "${{ github.workspace }}\inno_install_script_64bit.iss"
shell: cmd

- name: Upload the 64 bit installer with R as an artifact
uses: actions/upload-artifact@v4
if: ${{ github.event_name != 'pull_request' }}
with:
path: "Output/"
name: rinstat64WithR-innosetup


25 changes: 25 additions & 0 deletions installer/Rprofile.site
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Things you might want to change

# options(papersize="a4")
# options(editor="notepad")
# options(pager="internal")

# set the default help type
# options(help_type="text")
options(help_type="html")

# set a site library
# .Library.site <- file.path(chartr("\\", "/", R.home()), "site-library")

# Only use internal library
if (length(.libPaths()) == 2) .libPaths(.libPaths()[2])

# set a CRAN mirror
# local({r <- getOption("repos")
# r["CRAN"] <- "http://my.local.cran"
# options(repos=r)})

# Give a fortune cookie, but only to interactive sessions
# (This would need the fortunes package to be installed.)
# if (interactive())
# fortunes::fortune()
Loading
Loading