backport of commit 7d73065

.github/actions/vault-secrets/action.yml

@@ -18,7 +18,7 @@ runs:
     - name: Retrieve Vault-hosted Secrets
       if: endsWith(github.repository, '-enterprise')
       id: vault
-      uses: hashicorp/vault-action@d1720f055e0635fd932a1d2a48f87a666a57906c # v3.0.0
+      uses: hashicorp/vault-action@v2.4.3
       with:
         url: ${{ steps.vault-auth.outputs.addr }}
         caCertificate: ${{ steps.vault-auth.outputs.ca_certificate }}

.github/workflows/build.yml

@@ -132,7 +132,7 @@ jobs:
     strategy:
       matrix:
         goos: [linux]
-        goarch: ["arm64", "amd64"]
+        goarch: ["arm", "arm64", "amd64"]
       fail-fast: true
 
     name: Go ${{ needs.get-go-version.outputs.go-version }} ${{ matrix.goos }} ${{ matrix.goarch }} build
@@ -170,11 +170,16 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y \
             binutils-aarch64-linux-gnu \
-            gcc-aarch64-linux-gnu
+            binutils-arm-linux-gnueabihf \
+            gcc-aarch64-linux-gnu \
+            gcc-arm-linux-gnueabihf \
+            gcc-multilib-arm-linux-gnueabihf
 
       - name: Set gcc
         run: |
-          if [ "${{ matrix.goarch }}" == "arm64" ]; then
+          if [ "${{ matrix.goarch }}" == "arm" ]; then
+            echo "CC=arm-linux-gnueabihf-gcc" >> "$GITHUB_ENV"
+          elif [ "${{ matrix.goarch }}" == "arm64" ]; then
             echo "CC=aarch64-linux-gnu-gcc" >> "$GITHUB_ENV"
           fi
 

GNUmakefile

@@ -49,9 +49,12 @@ LAST_RELEASE ?= v1.8.0
 default: help
 
 ifeq (Linux,$(THIS_OS))
-ALL_TARGETS = linux_amd64 \
+ALL_TARGETS = linux_386 \
+	linux_amd64 \
+	linux_arm \
 	linux_arm64 \
 	linux_s390x \
+	windows_386 \
 	windows_amd64
 endif
 
@@ -93,6 +96,10 @@ endif
 		CC=$(CC) \
 		go build -trimpath -ldflags "$(GO_LDFLAGS)" -tags "$(GO_TAGS)" -o $(GO_OUT)
 
+ifneq (armv7l,$(THIS_ARCH))
+pkg/linux_arm/nomad: CC = arm-linux-gnueabihf-gcc
+endif
+
 ifneq (aarch64,$(THIS_ARCH))
 pkg/linux_arm64/nomad: CC = aarch64-linux-gnu-gcc
 endif

build_linux_arm.go

@@ -0,0 +1,9 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
+//go:build linux && cgo
+// +build linux,cgo
+
+// #cgo LDFLAGS: -mfloat-abi=hard
+
+package main

client/pluginmanager/drivermanager/testing.go

@@ -21,19 +21,20 @@ import (
 )
 
 type testManager struct {
-	logger   log.Logger
-	loader   loader.PluginCatalog
-	topology *numalib.Topology
+	logger log.Logger
+	loader loader.PluginCatalog
 }
 
+var (
+	topology = numalib.Scan(numalib.PlatformScanners())
+)
+
 func TestDriverManager(t *testing.T) Manager {
-	topology := numalib.Scan(numalib.PlatformScanners())
 	logger := testlog.HCLogger(t).Named("driver_mgr")
 	pluginLoader := catalog.TestPluginLoader(t)
 	return &testManager{
-		logger:   logger,
-		loader:   singleton.NewSingletonLoader(logger, pluginLoader),
-		topology: topology,
+		logger: logger,
+		loader: singleton.NewSingletonLoader(logger, pluginLoader),
 	}
 }
 
@@ -44,7 +45,7 @@ func (m *testManager) PluginType() string { return base.PluginTypeDriver }
 func (m *testManager) Dispense(driver string) (drivers.DriverPlugin, error) {
 	baseConfig := &base.AgentConfig{
 		Driver: &base.ClientDriverConfig{
-			Topology: m.topology,
+			Topology: topology,
 		},
 	}
 	instance, err := m.loader.Dispense(driver, base.PluginTypeDriver, baseConfig, m.logger)

e2e/consulcompat/run_ce_test.go

@@ -16,10 +16,12 @@ import (
 // versions of Consul CE
 func usable(v, minimum *version.Version) bool {
 	switch {
-	case v.LessThan(minimum):
+	case v.Prerelease() != "":
 		return false
 	case v.Metadata() != "":
 		return false
+	case v.LessThan(minimum):
+		return false
 	default:
 		return true
 	}

e2e/consulcompat/shared_download_test.go

@@ -19,6 +19,9 @@ import (
 	"github.com/shoenig/test/must"
 )
 
+// TODO: it would be good if we can add the latest non-GA'd beta/release
+// candidate version as well; that'll give us some lead time on any breaking
+// changes
 const (
 	binDir           = "consul-bins"
 	minConsulVersion = "1.16.0"