fix actions

plus3it · Jun 17, 2024 · 7680f2b · 7680f2b
1 parent 23c0f42
commit 7680f2b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Makefile.tardigrade-ci → Makefile b/Makefile.tardigrade-ci → Makefile
diff --git a/Makefile.spel b/Makefile.spel
@@ -45,13 +45,13 @@ endif
 all: build
 
 docs/lint:
-	$(MAKE) -f Makefile.spel docs/lint
+	$(MAKE) -f Makefile docs/lint
 
 docs/generate:
-	$(MAKE) -f Makefile.spel docs/generate
+	$(MAKE) -f Makefile docs/generate
 
 install:
-	$(MAKE) -f Makefile.spel packer/install
+	$(MAKE) -f Makefile packer/install
 	bash -eo pipefail ./build/install.sh
 
 # The profile and region envs are used only by the `pre_build`, `build`, and `post_build`

diff --git a/build/vagrant/Makefile b/build/vagrant/Makefile
@@ -30,7 +30,7 @@ $(info SPEL_VERSION=$(SPEL_VERSION))
 all: build
 
 install:
-	$(MAKE) -f ../../Makefile.spel packer/install
+	$(MAKE) -f ../../Makefile packer/install
 
 build: export PACKER_LOG = 1
 build: export PACKER_LOG_PATH = .spel/$(SPEL_VERSION)/packer.build-spel-vagrant.log

diff --git a/build/vagrant/build-spel-vagrant.sh b/build/vagrant/build-spel-vagrant.sh
@@ -41,7 +41,7 @@ if [[ -n "${SPEL_REPO_COMMIT:-}" ]] ; then
 fi
 
 # install packer
-make -f Makefile.spel packer/install
+make -f Makefile packer/install
 
 # build vagrant box
 mkdir -p "${CLONE_DIR}/.spel/${SPEL_VERSION:?}/"

diff --git a/build/vagrant/buildspec-vagrant.yml b/build/vagrant/buildspec-vagrant.yml
@@ -12,10 +12,10 @@ env:
 phases:
   install:
     commands:
-      - make -C -f Makefile.spel build/vagrant install
+      - make -C -f Makefile build/vagrant install
   build:
     commands:
-      - make -C -f Makefile.spel build/vagrant build
+      - make -C -f Makefile build/vagrant build
   post_build:
     commands:
       - find . -type f \( -name '*.box' -o -name '*.ova' \) -print0 | xargs -0 rm -f

diff --git a/buildspec.yml b/buildspec.yml
@@ -19,10 +19,10 @@ phases:
       - make install
   build:
     commands:
-      - make -f Makefile.spel build
+      - make -f Makefile build
   post_build:
     commands:
-      - make -f Makefile.spel post_build
+      - make -f Makefile post_build
       - find . -type f \( -name '*.box' -o -name '*.ova' \) -print0 | xargs -0 rm -f
 
 artifacts: