build: unify macos/windows yamls (#921)

Issue #, if available:

*Description of changes:*
To avoid issues where properties that are supposed to be the same (e.g.
the nerdctl-full archive) end up mismatched, I've introduced a way to
build our YAML files from a common source using [yq
](https://github.com/mikefarah/yq)

This won't work on Windows until this is merged to install yq on the
Windows runners runfinch/infrastructure#594
*Testing done:*
- Local testing


- [x] I've reviewed the guidance in CONTRIBUTING.md


#### License Acceptance

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

---------

Signed-off-by: Justin Alvarez <alvajus@amazon.com>

.github/workflows/benchmark.yaml

@@ -47,7 +47,7 @@ jobs:
           fi
       - name: Install Rosetta 2
         run: echo "A" | softwareupdate --install-rosetta || true
-      - run: brew install go lz4 automake autoconf libtool
+      - run: brew install go lz4 automake autoconf libtool yq
         shell: zsh {0}
       - name: Build project
         run: |

.github/workflows/build-and-test-pkg.yaml

@@ -53,7 +53,7 @@ jobs:
           cache: true
       - name: Make macos aarch64 build
         run: |
-          brew install lz4 automake autoconf libtool
+          brew install lz4 automake autoconf libtool yq
           git status
           git clean -f -d
           make clean
@@ -91,7 +91,7 @@ jobs:
 
       - name: Make macos x86_64 build
         run: |
-          brew install lz4 automake autoconf libtool
+          brew install lz4 automake autoconf libtool yq
           git status
           git clean -f -d
           make clean
@@ -166,7 +166,7 @@ jobs:
         run: echo "A" | softwareupdate --install-rosetta || true 
       - name: Build project
         run: |
-          brew install lz4 automake autoconf libtool
+          brew install lz4 automake autoconf libtool yq
           export PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH"
           make
         shell: zsh {0}
@@ -287,7 +287,7 @@ jobs:
         run: echo "A" | softwareupdate --install-rosetta || true 
       - name: Build project
         run: |
-          brew install lz4 automake autoconf libtool
+          brew install lz4 automake autoconf libtool yq
           export PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH"
           make
         shell: zsh {0}

.github/workflows/ci.yaml

@@ -190,7 +190,7 @@ jobs:
           fi
       - name: Install Rosetta 2
         run: echo "A" | softwareupdate --install-rosetta || true
-      - run: brew install lz4 automake autoconf libtool
+      - run: brew install lz4 automake autoconf libtool yq
         shell: zsh {0}
       - name: Build project
         run: |

.github/workflows/release-homebrew.yaml

@@ -99,7 +99,7 @@ jobs:
         run: echo "A" | softwareupdate --install-rosetta || true
       - name: Build project
         run: |
-          brew install lz4 automake autoconf libtool
+          brew install lz4 automake autoconf libtool yq
           export PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH"
           make
         shell: zsh {0}
@@ -220,7 +220,7 @@ jobs:
         run: echo "A" | softwareupdate --install-rosetta || true 
       - name: Build project
         run: |
-          brew install lz4 automake autoconf libtool
+          brew install lz4 automake autoconf libtool yq
           export PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH"
           make
         shell: zsh {0}

.github/workflows/upload-build-to-S3.yaml

@@ -27,7 +27,7 @@ jobs:
           cache: true
       - name: Make macos aarch64 build
         run: |
-          brew install lz4 automake autoconf libtool
+          brew install lz4 automake autoconf libtool yq
           make clean
           make download-licenses 
           make FINCH_OS_IMAGE_LOCATION_ROOT=/Applications/Finch
@@ -56,7 +56,7 @@ jobs:
           cache: true
       - name: Make macos x86_64 build
         run: |
-          brew install lz4 automake autoconf libtool
+          brew install lz4 automake autoconf libtool yq
           make clean
           make download-licenses 
           make FINCH_OS_IMAGE_LOCATION_ROOT=/Applications/Finch

CONTRIBUTING.md

@@ -117,7 +117,7 @@ For more details, see [`.golangci.yaml`](./.golangci.yaml) and the `lint` target
 Before building, install dependencies required to build the project binaries.
 
 ```sh
-brew install go lz4 automake autoconf libtool
+brew install go lz4 automake autoconf libtool yq
 ```
 
 Note that you may need to add the following to the `.profile` file of your shell if `which libtool` does not return the one installed by Homebrew. The one that comes with macOS is too old for our use.

Makefile

@@ -143,6 +143,8 @@ endif
 .PHONY: finch.yaml
 finch.yaml: finch-core
 	mkdir -p $(OUTDIR)/os
+	# merge the appropriate YAMLs
+	cd finch.yaml.d && yq eval-all '. as $$item ireduce ({}; . *+ $$item)' mac.yaml common.yaml > ../finch.yaml
 	cp finch.yaml $(OUTDIR)/os
 	# using -i.bak is very intentional, it allows the following commands to succeed for both GNU / BSD sed
 	# this sed command uses the alternative separator of "|" because the image location uses "/"
@@ -154,6 +156,8 @@ finch.yaml: finch-core
 .PHONY: finch.yaml
 finch.windows.yaml: finch-core-local
 	mkdir -p $(OUTDIR)/os
+	# merge the appropriate YAMLs
+	cd finch.yaml.d && yq eval-all '. as $$item ireduce ({}; . *+ $$item)' windows.yaml common.yaml > ../finch.windows.yaml
 	cp finch.windows.yaml $(OUTDIR)/os/finch.yaml
 	# using -i.bak is very intentional, it allows the following commands to succeed for both GNU / BSD sed
 	# this sed command uses the alternative separator of "|" because the image location uses "/"