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

semantic-release #61

Merged
merged 30 commits into from
Jan 20, 2020
Merged

semantic-release #61

merged 30 commits into from
Jan 20, 2020

Conversation

daks
Copy link
Member

@daks daks commented Sep 16, 2019

My own work on implementing semantic-release and update Kitchen tests. This is a WIP which needs to be reviewed, cleaned before any merged.
It also needs to be compared to #54 which also has started work on this implementation.

Complete tests results is here https://travis-ci.com/daks/packages-formula/builds/126515555. Only OS not working are Opensuse15 (as always? ;), Ubuntu 16.04, Debian 8 (old), Centos 6 (old).

CC @myii @javierbertoli

@daks daks requested review from javierbertoli and myii September 16, 2019 11:34
@myii
Copy link
Member

myii commented Sep 16, 2019

@daks Just some initial feedback.

How do you feel about having commits added to this PR? I've run this through via. ssf-formula and got a few changes to make, which would be easier just to add than explain. Also made a few other modifications and opensuse seems to be working now:

By the way, the issue with opensuse is that opensuse-leap-15 shows up as unknown -- the way to get around it is by using platform[:family] + suse (os[:family] probably works fine, too -- but I recall somewhere that platform is the new standard).

It seems I've broken amazon for now but that should be a simple fix. You can see the commit from there, it's only the initial step.

The yamllint errors would also need to be fixed:

packages-formula$ yamllint -s .
./.travis.yml
  21:10     error    empty value in block mapping  (empty-values)
  22:5      warning  comment not indented like content  (comments-indentation)

./pillar.example
  1:1       warning  missing document start "---"  (document-start)
  4:1       warning  comment not indented like content  (comments-indentation)
  26:1      warning  comment not indented like content  (comments-indentation)
  64:1      warning  comment not indented like content  (comments-indentation)
  65:89     error    line too long (121 > 88 characters)  (line-length)
  69:87     error    trailing spaces  (trailing-spaces)
  70:89     error    line too long (96 > 88 characters)  (line-length)
  94:43     warning  missing starting space in comment  (comments)
  97:89     error    line too long (93 > 88 characters)  (line-length)
  98:12     warning  missing starting space in comment  (comments)
  98:89     error    line too long (100 > 88 characters)  (line-length)
  101:35    warning  missing starting space in comment  (comments)
  106:89    error    line too long (102 > 88 characters)  (line-length)
  112:89    error    line too long (112 > 88 characters)  (line-length)
  118:89    error    line too long (108 > 88 characters)  (line-length)
  128:12    warning  truthy value should be one of [false, true]  (truthy)

./packages/defaults.yaml
  3:1       warning  missing document start "---"  (document-start)
  33:32     error    too few spaces after comma  (commas)
  35:14     warning  truthy value should be one of [false, true]  (truthy)
  36:23     error    too few spaces after comma  (commas)
  47:20     warning  missing starting space in comment  (comments)
  50:24     warning  missing starting space in comment  (comments)
  54:12     warning  truthy value should be one of [false, true]  (truthy)

./packages/osfamilymap.yaml
  3:1       warning  missing document start "---"  (document-start)

./packages/osmap.yaml
  1:1       warning  missing document start "---"  (document-start)
  14:23     error    too few spaces after comma  (commas)
  15:14     warning  truthy value should be one of [false, true]  (truthy)
  19:13     error    empty value in block mapping  (empty-values)

@daks
Copy link
Member Author

daks commented Sep 17, 2019

@myii no problem to you adding commits.

@daks
Copy link
Member Author

daks commented Oct 18, 2019

just remembered this WIP PR, what is its status? is there still work to be done?

@myii
Copy link
Member

myii commented Oct 18, 2019

@daks Let me run ssf-formula against it and add a commit here. I'll do that over the next hour or so. Then we can see where we're at.

@myii
Copy link
Member

myii commented Oct 18, 2019

@daks Right, I've just seen that I did start this process a couple of weeks back but ran into a trouble:

All of these were failing with:

Failed to complete #verify action: [progressbar is not part of the bundle. Add it to your Gemfile.] ...

@myii
Copy link
Member

myii commented Oct 18, 2019

Adding progressbar and minitest to the Gemfile seems to make a difference...

@myii
Copy link
Member

myii commented Oct 18, 2019

@daks OK, for whatever reason, I had to add the "unwanted" gems as well, to get through to the kitchen verify stage. But then it has issues with these gems. I'll point you to my developments and you can continue from there:

  ×  Wanted/Required gems: should be installed (2 failed)
     ×  true should be installed
     undefined method `installed?' for true:TrueClass
     Did you mean?  instance_of?
     ×  true should be installed
     undefined method `installed?' for true:TrueClass
     Did you mean?  instance_of?
  ×  Unwanted gems: should be uninstalled (3 failed)
     ×  true should not be installed
     undefined method `installed?' for true:TrueClass
     Did you mean?  instance_of?
     ×  true should not be installed
     undefined method `installed?' for true:TrueClass
     Did you mean?  instance_of?
     ×  true should not be installed
     undefined method `installed?' for true:TrueClass
     Did you mean?  instance_of?

You can access my branch to see the commits I added to get to this stage.

@myii
Copy link
Member

myii commented Dec 8, 2019

@daks Had a little conversation with @javierbertoli recently and the idea is to get this PR merged in and then Javier can look at bringing in the juicy bits from #54. Now, this has been a bit painful but I've got everything working:

The diff that would be applied on top of this PR is here:

Now for the bad news: this doesn't apply cleanly on top of the master branch. There have been a number of changes since this PR first started, so there'll have to be a rebase. I've got no problem doing that as well, as long as the changes I'm proposing to add here are OK. After having spent the time, I'd strongly suggest to get this merged ASAP so that it doesn't all have to be done again. With the nature of this formula, there are many things that keep moving, so it's best to get the tests in now, so that they can be updated along the way.

myii added a commit to myii/ssf-formula that referenced this pull request Dec 9, 2019
@daks
Copy link
Member Author

daks commented Dec 9, 2019

@myii I'm sorry but I have not enough time these days to work on it again.

Your proposed changes seems quite a lot, some to fix tests and also (it seems) that some are only needed to make the PR in-line with last version of template-formula. Maybe those last are not useful to merge this PR and can be done in a separated one.
But I'm OK with whatever needs to be done, adding commits, rebasing, squashing...

@myii
Copy link
Member

myii commented Dec 9, 2019

@daks There's no other way, unfortunately. The pre-salted images have also changed since this PR was first proposed and that affects the test, etc. And the formula itself has moved on significantly, so that still needs to be catered for. I'll take you on your last statement: "I'm OK with whatever needs to be done" -- because that's the stage we're at so that this PR can be recovered. Otherwise, I'm fine with opening another PR and pulling in your commits to that development. That will probably be cleaner than working here but a third semantic-release PR seems a bit too much. However, if your prefer that, then I'll do that. I may be forced to do that if I can't rebase this PR...

@daks
Copy link
Member Author

daks commented Dec 9, 2019

@myii no no I'm ok, go on! and thanks a lot :)

@myii
Copy link
Member

myii commented Dec 9, 2019

@daks Thanks, I'll let you know how I get along... it's not like you're going to miss the major roadworks!

@myii myii changed the title WIP semantic-release semantic-release Jan 16, 2020
@myii myii marked this pull request as ready for review January 16, 2020 13:31
@myii
Copy link
Member

myii commented Jan 16, 2020

OK, I've pushed the latest changes so this is ready to be reviewed and merged -- it only took 5 months! Since this is work by @daks and myself, we'd appreciate someone else to have a look if possible. Worst case, one of us will just merge it anyway!

CC: @javierbertoli @aboe76 @noelmcloughlin.


Copy link
Member

@aboe76 aboe76 left a comment

Choose a reason for hiding this comment

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

nice work @daks and @myii shall I merge it?

@myii
Copy link
Member

myii commented Jan 16, 2020

@aboe76 Yes, that would be helpful.

@daks
Copy link
Member Author

daks commented Jan 20, 2020

sorry for late answer @aboe76: ok for me

@daks daks merged commit 4c82563 into saltstack-formulas:master Jan 20, 2020
@saltstack-formulas-travis

🎉 This PR is included in version 0.8.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

5 participants