Merge pull request #608 from mcneel/AndyPayne/BootstrapUpdate

updating bootstrap script for testing
mcneel · Nov 2, 2023 · f4ef3b7 · f4ef3b7
2 parents 0e915bd + 10be448
commit f4ef3b7
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 14 deletions.
diff --git a/script/production/boostrap_server.ps1 b/script/production/boostrap_server.ps1
@@ -1,7 +1,7 @@
 # This script installs IIS and the features required to
 # run rhino.compute.
 #
-# * Make sure you run this script from a Powershel Admin Prompt!
+# * Make sure you run this script from a Powershell Admin Prompt!
 # * Make sure Powershell Execution Policy is bypassed to run these scripts:
 Set-ExecutionPolicy Bypass -Scope Process -Force
 

diff --git a/script/production/bootstrap_step-1.zip b/script/production/bootstrap_step-1.zip
diff --git a/script/production/boostrap_step-1.ps1 → ...tion/bootstrap_step-1/boostrap_step-1.ps1 b/script/production/boostrap_step-1.ps1 → ...tion/bootstrap_step-1/boostrap_step-1.ps1
@@ -1,7 +1,7 @@
 # This script installs IIS and the features required to
 # run rhino.compute.
 #
-# * Make sure you run this script from a Powershel Admin Prompt!
+# * Make sure you run this script from a Powershell Admin Prompt!
 # * Make sure Powershell Execution Policy is bypassed to run these scripts:
 Set-ExecutionPolicy Bypass -Scope Process -Force
 

diff --git a/script/production/module_firewall.ps1 → ...tion/bootstrap_step-1/module_firewall.ps1 b/script/production/module_firewall.ps1 → ...tion/bootstrap_step-1/module_firewall.ps1
diff --git a/script/production/module_iis_install.ps1 → ...n/bootstrap_step-1/module_iis_install.ps1 b/script/production/module_iis_install.ps1 → ...n/bootstrap_step-1/module_iis_install.ps1
diff --git a/script/production/module_rhino.ps1 → ...duction/bootstrap_step-1/module_rhino.ps1 b/script/production/module_rhino.ps1 → ...duction/bootstrap_step-1/module_rhino.ps1
@@ -42,7 +42,7 @@ SetEnvVar 'RHINO_COMPUTE_URLS' 'http://+:80'
 
 # Download and install Rhino
 Write-Step 'Download latest Rhino 7'
-$rhino7DownloadUrl = "https://www.rhino3d.com/download/rhino-for-windows/7/latest/direct?email=$EmailAddress"
+$rhino7DownloadUrl = "https://www.rhino3d.com/download/rhino-for-windows/7/latest/direct" #removed ?email=$EmailAddress to the end of the URL as it's not currently used
 $rhino7Setup = "rhino7_setup.exe"
 Download $rhino7DownloadUrl $rhino7Setup
 # TODO: print rhino version

diff --git a/script/production/bootstrap_step-2.zip b/script/production/bootstrap_step-2.zip
diff --git a/script/production/boostrap_step-2.ps1 → ...tion/bootstrap_step-2/boostrap_step-2.ps1 b/script/production/boostrap_step-2.ps1 → ...tion/bootstrap_step-2/boostrap_step-2.ps1
@@ -1,7 +1,7 @@
 # This script installs IIS and the features required to
 # run rhino.compute.
 #
-# * Make sure you run this script from a Powershel Admin Prompt!
+# * Make sure you run this script from a Powershell Admin Prompt!
 # * Make sure Powershell Execution Policy is bypassed to run these scripts:
 Set-ExecutionPolicy Bypass -Scope Process -Force
 

diff --git a/script/production/module_compute.ps1 → ...ction/bootstrap_step-2/module_compute.ps1 b/script/production/module_compute.ps1 → ...ction/bootstrap_step-2/module_compute.ps1
@@ -18,16 +18,7 @@ function Download {
 }
 #EndRegion funcs
 
-$gitPrefix = 'https://api.github.com/repos'
-$nightlyPrefix = 'https://nightly.link'
-$actionurl = 'mcneel/compute.rhino3d/actions/artifacts'
-$giturl = "$gitPrefix/$actionurl"
-
-$response = Invoke-RestMethod -Method Get -Uri $giturl
-$artifacts = $response.artifacts
-$latest = $artifacts[0]
-$artifactID = $latest.id
-$downloadurl = "$nightlyPrefix/$actionurl/$artifactID.zip"
+$downloadurl = 'https://nightly.link/mcneel/compute.rhino3d/workflows/workflow_ci/7.x/rhino.compute.zip'
 
 if (-Not (Test-Path -Path $appDirectory)){
     New-Item $appDirectory -ItemType Directory

diff --git a/script/production/module_hostingbundle.ps1 → ...bootstrap_step-2/module_hostingbundle.ps1 b/script/production/module_hostingbundle.ps1 → ...bootstrap_step-2/module_hostingbundle.ps1
diff --git a/script/production/module_iis_configure.ps1 → ...bootstrap_step-2/module_iis_configure.ps1 b/script/production/module_iis_configure.ps1 → ...bootstrap_step-2/module_iis_configure.ps1
diff --git a/script/production/module_update_rhino.ps1 b/script/production/module_update_rhino.ps1
@@ -29,6 +29,7 @@ Write-Host @"
 
 try {
     Write-Step 'Checking for update'
+
     $rhino7DownloadUrl = "https://www.rhino3d.com/download/rhino-for-windows/7/latest/direct?email=$EmailAddress"
     if ((Get-Host).Version.Major -gt 5) {
         $uri = (Invoke-WebRequest -Method 'GET' -MaximumRedirection 0 -Uri $rhino7DownloadUrl -ErrorAction Ignore -SkipHttpErrorCheck).Headers.Location