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

set up CI to work w/pre-release OpenStudio packages by adding OPENSTUDIO_VERSION_EXT. #473

Merged
merged 20 commits into from
Jun 3, 2019

Conversation

anyaelena
Copy link
Member

NOTE: adding separate issue/PR to allow Dockerfile to build off of pre-release OpenStudio Docker images. Changes to Dockerfile are not appropriate at this stage in the 2.8.0 release.

@coveralls
Copy link

coveralls commented Apr 3, 2019

Coverage Status

Coverage increased (+0.02%) to 66.881% when pulling 6195fc0 on version-suffix into a544c3b on develop.

@anyaelena
Copy link
Member Author

we are going to wait until after 2.8.0 to tackle pre-release extensions. for now, tim will also publish a duplicate package in the legacy format (ie $VERSION.$SHA instead of $VERSION$EXT.$SHA)

@nllong
Copy link
Member

nllong commented May 2, 2019

@anyaelena - can you resolve these conflicts and I will review this.

@anyaelena
Copy link
Member Author

ok @nllong this is also ready for review

publishing of OSS docker images and amis w/version extension should just work from master branch, assuming VERSION_EXT is set in server/lib/version.rb.

@anyaelena
Copy link
Member Author

actually @nllong hold off a little longer. i'm looking at moving our version/sha/ext config into a single yml file that can be referenced in travis, appveyor, and Dockerfile

@anyaelena
Copy link
Member Author

@nllong please review. Fixes #474.

@@ -56,13 +56,14 @@ jobs:
- BUILD_TYPE=docker
before_script:
# remove the .git in the .dockerignore so coverage can be reported correctly to coveralls
- export OPENSTUDIO_TAG=$(ruby -e "load 'server/app/lib/openstudio_server/version.rb'; print OpenstudioServer::VERSION+OpenstudioServer::VERSION_EXT")
Copy link
Member

Choose a reason for hiding this comment

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

nice


ARG OPENSTUDIO_VERSION=2.8.0
#may include suffix
ARG OPENSTUDIO_VERSION
Copy link
Member

Choose a reason for hiding this comment

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

looks like this is now going to be a required input... that is if the user does not specify the input then this won't build.

VERSION_EXT = ''.freeze # with preceding - or +
OS_SHA = '55665635f0'
Copy link
Member

@nllong nllong May 22, 2019

Choose a reason for hiding this comment

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

will this need to be specified every version change?

Copy link
Member

@nllong nllong left a comment

Choose a reason for hiding this comment

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

looks good. Just one question related to having to specify the OS_SHA in the version.rb file.

@anyaelena anyaelena merged commit 3ddf5ee into develop Jun 3, 2019
@anyaelena anyaelena deleted the version-suffix branch June 3, 2019 18:31
@anyaelena
Copy link
Member Author

closes #474

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants