Migration to github actions #693
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lorengordon
requested changes
Jun 17, 2024
spel/scripts/virtualbox.sh
Outdated
| @@ -10,7 +10,7 @@ echo "installing virtualbox guest addition dependencies" | |||
| VBOX_GUEST_DEPS=(kernel-devel kernel-headers gcc perl) | |||
| test "$(rpm --quiet -q bzip2)$?" -eq 0 || VBOX_GUEST_DEPS+=(bzip2) | |||
| bash /tmp/retry.sh 5 yum -y install "${VBOX_GUEST_DEPS[@]}" | |||
| bash /tmp/retry.sh 5 yum -y install dkms make | |||
| bash /tmp/retry.sh 5 yum -y install dkms make -f Makefile.spel | |||
There was a problem hiding this comment.
This is a yum install command, not a make command, so the option isn't valid here. No change needed.
Suggested change
| bash /tmp/retry.sh 5 yum -y install dkms make -f Makefile.spel | |
| bash /tmp/retry.sh 5 yum -y install dkms make |
build/vagrant/buildspec-vagrant.yml
Outdated
| @@ -12,10 +12,10 @@ env: | |||
| phases: | |||
| install: | |||
| commands: | |||
| - make -C build/vagrant install | |||
| - make -C -f Makefile.spel build/vagrant install | |||
There was a problem hiding this comment.
-C and -f actually conflict. No need to change these, since this is actually already telling make to use the vagrant buildspec.
Suggested change
| - make -C -f Makefile.spel build/vagrant install | |
| - make -C build/vagrant install |
build/vagrant/buildspec-vagrant.yml
Outdated
| build: | ||
| commands: | ||
| - make -C build/vagrant build | ||
| - make -C -f Makefile.spel build/vagrant build |
There was a problem hiding this comment.
Suggested change
| - make -C -f Makefile.spel build/vagrant build | |
| - make -C build/vagrant build |
build/vagrant/build-spel-vagrant.sh
Outdated
| @@ -41,7 +41,7 @@ if [[ -n "${SPEL_REPO_COMMIT:-}" ]] ; then | |||
| fi | |||
|
|
|||
| # install packer | |||
| make -f Makefile.tardigrade-ci packer/install | |||
| make -f Makefile.spel packer/install | |||
There was a problem hiding this comment.
Suggested change
| make -f Makefile.spel packer/install | |
| make packer/install |
build/vagrant/Makefile
Outdated
| @@ -30,7 +30,7 @@ $(info SPEL_VERSION=$(SPEL_VERSION)) | |||
| all: build | |||
|
|
|||
| install: | |||
| $(MAKE) -f ../../Makefile.tardigrade-ci packer/install | |||
| $(MAKE) -f ../../Makefile.spel packer/install | |||
There was a problem hiding this comment.
Suggested change
| $(MAKE) -f ../../Makefile.spel packer/install | |
| $(MAKE) -f ../../Makefile packer/install |
Makefile.spel
Outdated
|
|
||
| install: | ||
| $(MAKE) -f Makefile.tardigrade-ci packer/install | ||
| $(MAKE) -f Makefile.spel packer/install |
There was a problem hiding this comment.
Suggested change
| $(MAKE) -f Makefile.spel packer/install | |
| $(MAKE) -f Makefile packer/install |
Makefile.spel
Outdated
|
|
||
| docs/generate: | ||
| $(MAKE) -f Makefile.tardigrade-ci docs/generate | ||
| $(MAKE) -f Makefile.spel docs/generate |
There was a problem hiding this comment.
Suggested change
| $(MAKE) -f Makefile.spel docs/generate | |
| $(MAKE) -f Makefile docs/generate |
Makefile.spel
Outdated
| @@ -45,13 +45,13 @@ endif | |||
| all: build | |||
|
|
|||
| docs/lint: | |||
| $(MAKE) -f Makefile.tardigrade-ci docs/lint | |||
| $(MAKE) -f Makefile.spel docs/lint | |||
There was a problem hiding this comment.
Suggested change
| $(MAKE) -f Makefile.spel docs/lint | |
| $(MAKE) -f Makefile docs/lint |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.