Merge pull request #2 from africanmathsinitiative/master

Updating Master
NanyanziAlice · Jun 16, 2023 · 35b0564 · 35b0564
2 parents 3073a2c + 1fb2291
commit 35b0564
Show file tree

Hide file tree

Showing 177 changed files with 36,284 additions and 15,262 deletions.
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,25 @@
+changelog:
+  exclude:
+    labels:
+      - 'skip-releasenotes'
+  categroies:
+    - title: '⭐ Features'
+      labels:
+        - 'feature'
+        - 'enhancement'
+    - title: '🐞 Bug Fixes'
+      labels:
+        - 'fix'
+        - 'bugfix'
+        - 'bug'
+    - title: '🌦️ Climatic'
+      labels: 
+        - 'Climatic'
+    - title: '📝 Procurement'
+      labels: 
+        - 'Procurement'
+    - title: 'Other Changes'
+      labels:
+        - "*"
+
+
diff --git a/.github/workflows/CreateInstaller.yml b/.github/workflows/CreateInstaller.yml
@@ -27,9 +27,11 @@ jobs:
     env:
       Solution_Name: Instat.sln                        
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+
 
     # check out r-instat
-    steps:
+    steps:   
+
     - name: Checkout
       uses: actions/checkout@v3
       with:
@@ -167,6 +169,9 @@ jobs:
         ROBOCOPY R-RInstat\32Bit\ instat\bin\Release\static\ /E
       continue-on-error: true 
 
+    - name: Set R-tools
+      uses: r-windows/install-rtools@master 
+
     - name: Install R packages (64 bit)
       run: |
         "instat\bin\x64\Release\static\R\bin\Rscript.exe" "instat\static\InstatObject\R\InstallPackages.R"

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
@@ -0,0 +1,50 @@
+name: Test code 
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-2019 
+
+    steps:
+
+    # Create directory and copy over InstatData (64bit)
+    - name: Make Library directory 64 bit
+      run: |
+        MKDIR instat\bin\x64\Release\static\  
+     
+
+    # check out R for R-Instat
+    - name: Checkout R for R-Instat
+      uses: actions/checkout@v3
+      with:
+        repository: 'ChrisMarsh82/R-RInstat'
+        fetch-depth: 0
+        path: 'R-RInstat'
+
+    - name: Copy R 64 bit
+      run: |
+        ROBOCOPY R-RInstat\64Bit\ instat\bin\x64\Release\static\ /E
+      continue-on-error: true      
+
+
+
+    - name: make r tools directory
+      run: |
+        MKDIR rtools  
+
+    
+    - name: Install R tools
+      run : |
+        curl -o D:\a\R-Instat\R-Instat\rtools\R-4.0.0-win.exe https://cran.r-project.org/bin/windows/base/R-4.0.0-win.exe 
+
+        
+    - name: install
+      run : | 
+        D:\a\R-Instat\R-Instat\rtools\R-4.0.0-win.exe /NORESTART /VERYSILENT /SUPPRESSMSGBOXES
+        
+    - name: update path
+      run : |
+        setx path "instat\bin\x64\Release\static\R\bin\;R-4.0.0\bin"
+
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v5.21.1
         # with:
           # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
           # config-name: my-config.yml

diff --git a/.gitignore b/.gitignore
@@ -251,3 +251,4 @@ installer/Output/
 /packages/jacobslusser.ScintillaNET.*/
 
 /packages/NLog.*/
+/packages/Newtonsoft.Json.*/
diff --git a/docs/Download.html b/docs/Download.html
@@ -88,6 +88,26 @@ <h3>Latest stable release 0.7.6</h3>
                   <p>If you know that you have a 64 bit computer, we suggest you download the 64 Bit version</p>
                   <hr class="light">
                   <h3>Other releases (beta)</h3>
+                  <h4>0.7.14</h4>
+                  <p>
+                    <a href="https://downloads.r-instat.org/R-Instat_0.7.14.48_Installer_32.exe" style="color:blue;" target="_blank">32 Bit (.exe 831MB)</a> |
+                    <a href="https://downloads.r-instat.org/R-Instat_0.7.14.48_Installer_64.exe" style="color:blue;" target="_blank">64 Bit (.exe 972MB)</a>
+                  </p>
+                  <h4>0.7.12</h4>
+                  <p>
+                    <a href="https://downloads.r-instat.org/R-Instat_0.7.12.46_Installer_32.exe" style="color:blue;" target="_blank">32 Bit (.exe 874MB)</a> |
+                    <a href="https://downloads.r-instat.org/R-Instat_0.7.12.46_Installer_64.exe" style="color:blue;" target="_blank">64 Bit (.exe 1015MB)</a>
+                  </p>
+                  <h4>0.7.10</h4>
+                  <p>
+                    <a href="https://downloads.r-instat.org/R-Instat_0.7.10.43_Installer_32.exe" style="color:blue;" target="_blank">32 Bit (.exe 874MB)</a> |
+                    <a href="https://downloads.r-instat.org/R-Instat_0.7.10.43_Installer_64.exe" style="color:blue;" target="_blank">64 Bit (.exe 1015MB)</a>
+                  </p>
+                  <h4>0.7.9</h4>
+                  <p>
+                    <a href="https://downloads.r-instat.org/R-Instat_0.7.9.41_Installer_32.exe" style="color:blue;" target="_blank">32 Bit (.exe 850MB)</a> |
+                    <a href="https://downloads.r-instat.org/R-Instat_0.7.9.41_Installer_64.exe" style="color:blue;" target="_blank">64 Bit (.exe 979MB)</a>
+                  </p>
                   <h4>0.7.8</h4>
                   <p>
                     <a href="https://downloads.r-instat.org/R-Instat_0_7_8_Installer_32.exe" style="color:blue;" target="_blank">32 Bit (.exe 780MB)</a> |