CI fixes, new plugin location, etc

veertuinc · Mar 22, 2024 · 2a28643 · 2a28643
1 parent 059500c
commit 2a28643
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
@@ -23,7 +23,7 @@ jobs:
         uses: hashicorp/setup-packer@main
         id: setup
         with:
-          version: 1.9.1
+          version: 1.11.0-alpha
       - name: Describe plugin
         id: plugin_describe
         run: echo "::set-output name=api_version::$(go run . describe | jq -r '.api_version')"

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -19,7 +19,7 @@ builds:
         - cmd: bash -c "chmod +x {{ .ProjectName }}_v{{ .Version }}_{{ .Env.PACKER_CI_PROJECT_API_VERSION }}_{{ .Os }}_{{ .Arch }}"
           dir: "{{ dir .Path }}"
         - cmd: bash -c "make install && packer plugins installed"
-        # - cmd: bash -c "cp -rfp {{ dir .Path }}/{{ .ProjectName }}_v{{ .Version }}_{{ .Env.PACKER_CI_PROJECT_API_VERSION }}_{{ .Os }}_{{ .Arch }} ./{{ .ProjectName }}"
+        - cmd: bash -c "cp -rfp {{ dir .Path }}/{{ .ProjectName }}_v{{ .Version }}_{{ .Env.PACKER_CI_PROJECT_API_VERSION }}_{{ .Os }}_{{ .Arch }} ./{{ .ProjectName }}"
         - cmd: bash -c "make validate-examples"
         - cmd: bash -c "packer-sdc plugin-check {{ .ProjectName }}"
         - cmd: bash -c "rm -f ./{{ .ProjectName }}"
@@ -30,7 +30,7 @@ builds:
     goos:
       - darwin
     goarch:
-      - amd64
+      - arm64
     binary: '{{ .ProjectName }}_v{{ .Version }}_{{ .Env.PACKER_CI_PROJECT_API_VERSION }}_{{ .Os }}_{{ .Arch }}'
     no_unique_dist_dir: true
   -
@@ -56,7 +56,7 @@ builds:
     goos:
       - darwin
     goarch:
-      - arm64
+      - amd64
     binary: '{{ .ProjectName }}_v{{ .Version }}_{{ .Env.PACKER_CI_PROJECT_API_VERSION }}_{{ .Os }}_{{ .Arch }}'
     no_unique_dist_dir: true
 archives:
@@ -89,4 +89,4 @@ release:
   disable: true
 
 changelog:
-  skip: true
+  disable: true
diff --git a/Makefile b/Makefile
@@ -57,7 +57,10 @@ validate-examples:
 
 #install:		@ run packer plugin install
 install:
-	packer plugins install --path ./$(BIN_FULL) "github.com/veertuinc/veertu-anka"
+	pwd;
+	ls -laht ./
+	ls -alht $(WORKDIR)/$(BIN_FULL)
+	packer plugins install --path $(WORKDIR)/$(BIN_FULL) "github.com/veertuinc/veertu-anka"
 
 #uninstall:		@ run packer plugin uninstaller
 uninstall: