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.

Sign up for GitHub

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

Jump to bottom

Fix Armake problems #6697

Merged
merged 3 commits into from
Nov 29, 2018
Merged

Fix Armake problems #6697

merged 3 commits into from
Nov 29, 2018

Conversation

dedmen
Copy link
Contributor

@dedmen dedmen commented Nov 19, 2018 •
edited
Loading

Don't specify skeletonName if you don't have a skeleton.
Add missing model.cfg entries even if they just refer to the default.

Btw model.cfg files are still mixed tabs/spaces.
I even found tabs and spaces on the same line, with the spaces being 3 space indent.
But I won't fix that in here. I just fixed that one because I noticed it there.

@thojkooi thojkooi added kind/bug-fix Release Notes: **FIXED:** impact/trivial labels Nov 19, 2018
@thojkooi thojkooi added this to the 3.13.0 milestone Nov 19, 2018
@thojkooi
Copy link
Contributor

Nice, thanks for making this PR @dedmen!

@jonpas
Copy link
Member

jonpas commented Nov 19, 2018 •
edited
Loading

You are using tabs. We should add .cfg to style validator.

jonpas
jonpas requested changes Nov 19, 2018
View reviewed changes
Copy link
Member

@jonpas jonpas left a comment

Choose a reason for hiding this comment

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

Tabs -> spaces!

@dedmen
Copy link
Contributor Author

dedmen commented Nov 20, 2018 •
edited
Loading

You are using tabs. We should add .cfg to style validator.

Btw model.cfg files are still mixed tabs/spaces.

Also without my changes they are. I either didn't change them. Or made them spaces.

@jonpas
Copy link
Member

jonpas commented Nov 20, 2018

No, your additions are using tabs while stuff around it mostly uses spaces.

@dedmen dedmen changed the title WIP: Fix Armake problems Fix Armake problems Nov 26, 2018
@dedmen
Copy link
Contributor Author

dedmen commented Nov 26, 2018 •
edited
Loading

Builds with 0 warnings/errors now on my c++ branch. Didn't check plain armake.

@thojkooi
Copy link
Contributor

thojkooi commented Nov 29, 2018 •
edited
Loading

Remaining warnings are all missing prefix for model.

Should probably not be part of this pr though. Lets get this merged instead.

@jonpas jonpas merged commit b3e0135 into acemod:master Nov 29, 2018
@dedmen
Copy link
Contributor Author

dedmen commented Nov 29, 2018 •
edited
Loading

Remaining warnings are all missing prefix for model.

I broke that then on my end? Thanks. I'll have to fix that.

🤦‍♂️ I disabled all warnings except excessive_concatenation :D

OH MAH GAWD. All the is not quoted properly spam :D

@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.12.5 Dec 3, 2018
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
@dedmen @jonpas
Fix Armake problems (#6697)
3d931b9 
* Armake model.cfg fix

* Spaces!

* Case sensitive filenames fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thojkooi thojkooi thojkooi approved these changes

@jonpas jonpas jonpas approved these changes

@PabstMirror PabstMirror PabstMirror approved these changes

Assignees
No one assigned
Labels
impact/trivial kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Milestone
3.12.5
Development

Successfully merging this pull request may close these issues.
4 participants
@dedmen @thojkooi @jonpas @PabstMirror