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

Merge from upstream #1

Merged
merged 2 commits into from
May 25, 2020
Merged

Merge from upstream #1

merged 2 commits into from
May 25, 2020

Conversation

marnunez
Copy link
Owner

Fixes issue #<issue_number>

Brief summary of changes

Testing I've completed

CHANGELOG.md (choose one)

  • no need to update because...
  • updated...

aymanhab and others added 2 commits April 17, 2020 12:52
* Add ant build target for linux

* Add CMake rule for linux

* update opensim.conf for Linux; add logo and .desktop file

* Fix file permissions in tar

* Add version to opensim.conf

* Add Ubuntu builds to GitHub Action CI

* Add INSTALL script; set jdkhome properly

* Fix INSTALL script

* Add Linux build instructions to README

* Run GitHub Actions CI on PRs

* Fix typo in opensim-core download

* Fix netbeans/harness location for cmake; try caching netbeans installer

* Try again...

* Change back to ~ for opensim-core

* Change netbeans install to verbose (will still fail, help with debug)

* Revert to silent netbeans install, ls home contents to verify install/location

* (Hopefully) Final GH actions CI update

- Cache the entire netbeans install directory

* Improve INSTALL script; tweak build instructions on README

* Revert GitHub CI to only run on push

* Update README, CHANGELOG, and CONTRIBUTING

* De-duplicate private properties file creation

* Use more reasonable OS conditionals

* Change INSTALL language to reflect beta status

* Update description in .desktop

* Remove extraneous line
@marnunez marnunez merged commit 775ccc9 into marnunez:master May 25, 2020
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