Set correct GOOS for linux-arm64, use new --arch flag

fleetdm · Jul 2, 2024 · 7f3fd75 · 7f3fd75
1 parent 0e130bf
commit 7f3fd75
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/tools/tuf/test/create_repository.sh b/tools/tuf/test/create_repository.sh
@@ -82,9 +82,11 @@ for system in $SYSTEMS; do
         goose_value="darwin"
     fi
     if [[ $system == "linux-amd64" ]]; then
+        goose_value="linux"
         goarch_value="amd64"
     fi
     if [[ $system == "linux-arm64" ]]; then
+        goose_value="linux"
         goarch_value="arm64"
     fi
     orbit_target=orbit-$system

diff --git a/tools/tuf/test/gen_pkgs.sh b/tools/tuf/test/gen_pkgs.sh
@@ -62,8 +62,9 @@ fi
 
 if [ -n "$GENERATE_DEB" ]; then
     echo "Generating deb (amd64)..."
-    GOARCH=amd64 ./build/fleetctl package \
+    ./build/fleetctl package \
         --type=deb \
+        --arch=amd64 \
         ${FLEET_DESKTOP:+--fleet-desktop} \
         --fleet-url=$DEB_FLEET_URL \
         --enroll-secret=$ENROLL_SECRET \
@@ -83,8 +84,9 @@ if [ -n "$GENERATE_DEB" ]; then
         --update-url=$DEB_TUF_URL
 
     echo "Generating deb (arm64)..."
-    GOARCH=arm64 ./build/fleetctl package \
+    ./build/fleetctl package \
         --type=deb \
+        --arch=arm64 \
         ${FLEET_DESKTOP:+--fleet-desktop} \
         --fleet-url=$DEB_FLEET_URL \
         --enroll-secret=$ENROLL_SECRET \
@@ -106,8 +108,9 @@ fi
 
 if [ -n "$GENERATE_RPM" ]; then
     echo "Generating rpm (amd64)..."
-    GOARCH=amd64 ./build/fleetctl package \
+    ./build/fleetctl package \
         --type=rpm \
+        --arch=amd64 \
         ${FLEET_DESKTOP:+--fleet-desktop} \
         --fleet-url=$RPM_FLEET_URL \
         --enroll-secret=$ENROLL_SECRET \
@@ -127,8 +130,9 @@ if [ -n "$GENERATE_RPM" ]; then
         --update-url=$RPM_TUF_URL
 
     echo "Generating rpm (arm64)..."
-    GOARCH=arm64 ./build/fleetctl package \
+    ./build/fleetctl package \
         --type=rpm \
+        --arch=arm64 \
         ${FLEET_DESKTOP:+--fleet-desktop} \
         --fleet-url=$RPM_FLEET_URL \
         --enroll-secret=$ENROLL_SECRET \

diff --git a/tools/tuf/test/main.sh b/tools/tuf/test/main.sh
@@ -30,5 +30,5 @@ if [ -z "$SKIP_SERVER" ]; then
 fi
 
 if [ -n "$GENERATE_PKG" ] || [ -n "$GENERATE_DEB" ] || [ -n "$GENERATE_RPM" ] || [ -n "$GENERATE_MSI" ]; then
-  ./tools/tuf/test/gen_pkgs.sh
+    bash ./tools/tuf/test/gen_pkgs.sh
 fi