Skip to content
Open
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a9515e0
test using all supported platforms in GH actions
tijcolem Oct 28, 2021
e2d988a
remove the branch name as not using it
tijcolem Oct 28, 2021
49aaa6e
Add different workflow title
tijcolem Oct 28, 2021
3124cbd
Merge pull request #1 from tijcolem/expand_platforms
tijcolem Oct 28, 2021
cbbd260
try and shorten the description input labels
tijcolem Oct 28, 2021
2cb984f
fix yaml
tijcolem Oct 28, 2021
dea721b
remove extra 2004 block
tijcolem Oct 28, 2021
78ce073
use curl vs wget on windows
tijcolem Oct 28, 2021
817fa98
try again on windows download
tijcolem Oct 28, 2021
77a127f
try again on windows download
tijcolem Oct 28, 2021
4c7aae5
try and fix mac installer
tijcolem Oct 28, 2021
e3bf56c
let's try and test using ruby bindings
tijcolem Oct 28, 2021
976c482
enable ruby binding test on all platforms
tijcolem Oct 28, 2021
1975a70
add both cli and ruby bindings tests
tijcolem Oct 29, 2021
dcbbdd2
fix mac nproc cmd
tijcolem Oct 29, 2021
8721379
fix mac nproc again
tijcolem Oct 29, 2021
9e6f748
use single qt install script
tijcolem Nov 2, 2021
e7885eb
add tags to cli and ruby and process these using tagged option
tijcolem Nov 2, 2021
11600eb
Merge remote-tracking branch 'nrel/develop' into develop
tijcolem Apr 12, 2022
61dff0d
make the all platform action use a single base url
tijcolem Apr 12, 2022
8d3b3e0
add / to end of urls
tijcolem Apr 12, 2022
a85e66c
fix description
tijcolem Apr 12, 2022
c03a038
add proper default value
tijcolem Apr 12, 2022
8742b73
remove end /
tijcolem Apr 12, 2022
e0f46c3
fix mac file type
tijcolem Apr 12, 2022
9a404be
Force an Always On Supply Air Fan Operating Mode Schedule for PTAC/PTHP
jmarrec Sep 30, 2022
2d36564
Merge remote-tracking branch 'remotes/nrel/develop' into develop
tijcolem Oct 4, 2022
626a501
updating ext for mac installer
tijcolem Oct 4, 2022
287a76c
update required to false for prerelease tag
tijcolem Oct 6, 2022
9f02ada
update 3.4.0 tests
Oct 12, 2022
1bfa708
Merge branch 'develop' of https://github.com/tijcolem/OpenStudio-reso…
tijcolem Oct 12, 2022
4d7e35e
merge latest from nrel/OpenStudio-resources
tijcolem Mar 21, 2023
4daa011
update to use 22.04 runner
tijcolem Apr 5, 2023
cf87ef2
fixes for url paths and ruby action
tijcolem Apr 5, 2023
2233455
update mac runner to macos-11
tijcolem May 8, 2023
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
45 changes: 25 additions & 20 deletions .github/workflows/manual_installer_all_platforms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ name: Test OS SDK Installer - All Platforms
on:
workflow_dispatch:
inputs:
os_installer_ubuntu_1804:
description: 'Ubuntu 1804 (.deb) URL'
base_url:
description: 'The base url to use to download each platform'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we expect to use builds from s3 instead of a prerelease? just curious

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I recently used s3 as a test and works fine.

required: true
default: 'https://github.com/NREL/OpenStudio/releases/download/v3.2.1/OpenStudio-3.2.1%2Bbdbdbc9da6-Ubuntu-18.04.deb'
os_installer_ubuntu_2004:
description: 'Ubuntu 2004 (.deb) URL'
default: 'https://github.com/NREL/OpenStudio/releases/download/v3.2.1/'
os_version:
description: 'OpenStudio Build sha (first 10 chars)'
required: true
default: 'https://github.com/NREL/OpenStudio/releases/download/v3.2.1/OpenStudio-3.2.1%2Bbdbdbc9da6-Ubuntu-20.04.deb'
os_installer_windows:
description: 'Windows (.exe) URL'
default: 'bdbdbc9da6'
os_prerelease_tag:
description: 'Pre-release tag (e.g. -alpha, -rc1)'
required: true
default: 'https://github.com/NREL/OpenStudio/releases/download/v3.2.1/OpenStudio-3.2.1%2Bbdbdbc9da6-Windows.exe'
os_installer_osx:
description: 'Mac OSX (.dmg) URL'
required: true
default: 'https://github.com/NREL/OpenStudio/releases/download/v3.2.1/OpenStudio-3.2.1%2Bbdbdbc9da6-Darwin.dmg'
default: ''
os_build_sha:
description: 'OpenStudio Build sha (first 10 chars)'
required: true
default: 'bdbdbc9da6'

jobs:
installer_ubuntu_1804:
Expand All @@ -37,9 +37,10 @@ jobs:
shell: bash
run: |
set -x
echo "Installer link: ${{ github.event.inputs.os_installer_ubuntu_1804 }}"
installer_url="${{ github.event.inputs.base_url}}OpenStudio-${{ github.event.inputs.os_version}}${{ github.event.inputs.os_prerelease_tag}}%2B${{ github.event.inputs.os_build_sha}}-Ubuntu-18.04.deb"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe a bit fragile, if you forgot the trailing slash in base_url?

Copy link
Contributor

@jmarrec jmarrec Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same would need to be applied to all jobs

Suggested change
installer_url="${{ github.event.inputs.base_url}}OpenStudio-${{ github.event.inputs.os_version}}${{ github.event.inputs.os_prerelease_tag}}%2B${{ github.event.inputs.os_build_sha}}-Ubuntu-18.04.deb"
base_url="${{ github.event.inputs.base_url}}"
# remove trailing slash if any
base_url=${base_url%/}
installer_url="$base_url/OpenStudio-${{ github.event.inputs.os_version}}${{ github.event.inputs.os_prerelease_tag}}%2B${{ github.event.inputs.os_build_sha}}-Ubuntu-18.04.deb"

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, this would be good to add.

echo "Installer link: $installer_url"
sudo apt update
wget '${{ github.event.inputs.os_installer_ubuntu_1804 }}'
wget $installer_url
sudo apt install -y ./OpenStudio*.deb
openstudio openstudio_version

Expand Down Expand Up @@ -113,9 +114,10 @@ jobs:
shell: bash
run: |
set -x
echo "Installer link: ${{ github.event.inputs.os_installer_ubuntu_2004 }}"
installer_url="${{ github.event.inputs.base_url}}OpenStudio-${{ github.event.inputs.os_version}}${{ github.event.inputs.os_prerelease_tag}}%2B${{ github.event.inputs.os_build_sha}}-Ubuntu-20.04.deb"
echo "Installer link: $installer_url"
sudo apt update
wget '${{ github.event.inputs.os_installer_ubuntu_2004 }}'
wget $installer_url
sudo apt install -y ./OpenStudio*.deb
openstudio openstudio_version

Expand Down Expand Up @@ -189,8 +191,9 @@ jobs:
shell: bash
run: |
set -x
echo "Installer link: ${{ github.event.inputs.os_installer_windows }}"
curl -SLO '${{ github.event.inputs.os_installer_windows }}'
installer_url="${{ github.event.inputs.base_url}}/OpenStudio-${{ github.event.inputs.os_version}}${{ github.event.inputs.os_prerelease_tag}}%2B${{ github.event.inputs.os_build_sha}}-Windows.exe"
echo "Installer link: $installer_url"
curl -SLO $installer_url
OS_NAME=$(ls *.exe)
# script installs to /c/openstudio
sed -i -e "s|REPLACEME|c:\\\\\\\\openstudio|" ci/install-openstudio.qs
Expand Down Expand Up @@ -265,8 +268,10 @@ jobs:
shell: bash
run: |
set -x
installer_url="${{ github.event.inputs.base_url}}OpenStudio-${{ github.event.inputs.os_version}}${{ github.event.inputs.os_prerelease_tag}}%2B${{ github.event.inputs.os_build_sha}}-Ubuntu-20.04.deb"
echo "Installer link: $installer_url"
echo "Installer link: ${{ github.event.inputs.os_installer_osx }}"
wget '${{ github.event.inputs.os_installer_osx }}'
wget $installer_url
OS_NAME=$(ls *.dmg)
OS_NAME_NO_EXT=$(basename $OS_NAME .dmg)
sed -i -e "s|REPLACEME|$HOME/openstudio|" ci/install-openstudio.qs
Expand Down