Pin packer version to 1.11

bcomnes · Jul 23, 2024 · 969a457 · 969a457
1 parent 811ec45
commit 969a457
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,8 +3,8 @@ name: build
 on: [push, workflow_dispatch]
 
 env:
-  PACKER_VERSION: latest
-  LIBARCHIVE_VERSION: 3.7.2
+  PACKER_VERSION: v1.11.1
+  LIBARCHIVE_VERSION: 3.7.4
   GO_VERSION: '^1.21.6'
   PACKER_CACHE_DIR: ~/packer_cache/
 

diff --git a/build-packer.sh b/build-packer.sh
@@ -17,8 +17,9 @@ PACKER_VERSION="$1"
 #./packer version
 #echo "Finished building packer"
 
-echo "Building github.com/mkaczanowski/packer-builder-arm"
+echo "Building github.com/michalfita/packer-plugin-cross"
 # Version tracked in go.mod + tools.go
-go build -v -o packer-builder-arm github.com/mkaczanowski/packer-builder-arm
-echo "Finished building github.com/mkaczanowski/packer-builder-arm"
+go build -v -o packer-plugin-cross github.com/michalfita/packer-plugin-cross
+packer plugins install -path packer-plugin-cross github.com/michalfita/cross 
+echo "Finished building github.com/michalfita/packer-plugin-cross"
 
diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module github.com/bcomnes/raspi-packer
 
 go 1.21.6
 
-require github.com/mkaczanowski/packer-builder-arm v1.0.9
+require github.com/michalfita/packer-plugin-cross v1.1.3
 
 require (
 	cloud.google.com/go v0.110.0 // indirect

diff --git a/go.sum b/go.sum
@@ -545,6 +545,8 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mholt/archiver/v3 v3.5.1 h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo=
 github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4=
+github.com/michalfita/packer-plugin-cross v1.1.3 h1:KA/o2IsNRdLtopKtDlqDMRzHqEvgdhjxxMnvSCbLp+k=
+github.com/michalfita/packer-plugin-cross v1.1.3/go.mod h1:qacW3RWGtgP/w3gTuj7MpXb4Du5aOSJYiUzt5CG3em8=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
@@ -567,8 +569,6 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/mkaczanowski/packer-builder-arm v1.0.9 h1:2jHlCKRHIHfpbSX8S2qZF7mU/50ow7cGL0HLSueH2GY=
-github.com/mkaczanowski/packer-builder-arm v1.0.9/go.mod h1:I25YamS5kBdxUicX5UGkE7d6LG4h6ErKBU0iT1nLo+A=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=

diff --git a/packer-builder-arm → packer-plugin-cross b/packer-builder-arm → packer-plugin-cross
diff --git a/packer.json b/packer.json
@@ -18,7 +18,7 @@
     "cm4_usb": "false"
   },
   "builders": [{
-    "type": "arm",
+    "type": "cross",
     "file_urls" : ["{{user `img_url`}}"],
     "file_checksum_url": "{{user `img_url`}}.md5",
     "file_checksum_type": "md5",

diff --git a/tools.go b/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package tools
@@ -6,5 +7,5 @@ package tools
 // for more details
 
 import (
-	_ "github.com/mkaczanowski/packer-builder-arm"
+	_ "github.com/michalfita/packer-plugin-cross"
 )