Merge branch 'version/0-48-0-RC1' into DX-3164

Author: mitchell-as

.github/deps/Linux/bin/parallelize .github/deps/Linux/amd64/bin/parallelize.github/deps/Linux/bin/parallelize renamed to .github/deps/Linux/amd64/bin/parallelize

@@ -36,11 +36,12 @@ jobs:
     strategy:
       matrix:
         go-version:
-          - 1.22.x
+          - 1.22.12
         sys:
           - {os: ubuntu-latest}
           - {os: macos-13, shell: zsh}
           - {os: windows-2019}
+          - {os: ubuntu-24.04-arm}
       fail-fast: false
     runs-on: ${{ matrix.sys.os }}
     env:
@@ -74,19 +75,39 @@ jobs:
 
       # === Install gotestfmt ===
       - name: Set up gotestfmt
-        uses: gotesttools/gotestfmt-action@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
 
       - # === Install State Tool ===
         name: Install State Tool
         uses: ActiveState/setup-state-tool@v1
+        if: "!contains(matrix.sys.os, 'arm') && runner.os != 'Windows'"
+
+      - # === Install State Tool (ARM64) ===
+        name: Install State Tool (ARM64)
+        if: contains(matrix.sys.os, 'arm')
+        shell: bash
+        run: |
+          ./installers/install.sh -b beta
+          echo "$HOME/.local/ActiveState/StateTool/beta/bin" >> $GITHUB_PATH
+          "$HOME/.local/ActiveState/StateTool/beta/bin/state" config set optin.unstable true
+
+      - # === Install State Tool (Windows) ===
+        name: Install State Tool (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          Invoke-Expression -Command ".\installers\install.ps1 -n"
+          echo "$env:LOCALAPPDATA\ActiveState\StateTool\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          Invoke-Expression "$env:LOCALAPPDATA\ActiveState\StateTool\release\bin\state config set optin.unstable true"
 
       - # === Setup ===
         name: Setup
         shell: bash
         run: |
-          bin=$(pwd)/.github/deps/${{ runner.os }}/bin
+          arch="amd64"
+          if [[ ${{ contains(matrix.sys.os, 'arm') }} = true ]]; then arch="arm64"; fi
+          bin=$(pwd)/.github/deps/${{ runner.os }}/$arch/bin
           echo "Adding $bin to PATH"
           echo "$bin" >> $GITHUB_PATH
 
@@ -125,7 +146,6 @@ jobs:
         shell: bash
         timeout-minutes: 15
         run: |
-          export PATH="$(pwd)/.github/deps/${{ runner.os }}/bin:$PATH"
           parallelize "$(cat <<'EOF'
           [
             {
@@ -262,7 +282,7 @@ jobs:
 
       - # === Configure AWS credentials ==
         name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
           role-session-name: ${{ env.AWS_ROLE_SESSION_NAME }}
@@ -325,6 +345,10 @@ jobs:
             fi
           else
             TEST_SUITE_TAGS="all"
+            if [[ ${{ contains(matrix.sys.os, 'arm') }} = true ]]; then
+              echo "Skipping integration tests on ARM"
+              exit 0
+            fi
           fi
 
           echo "Running integration tests with tags: $TEST_SUITE_TAGS (empty means every test not specifically tagged)"
@@ -410,7 +434,6 @@ jobs:
           merge-multiple: true
 
       - name: Scan for CVEs
-        if: runner.os == 'Linux'
         uses: aquasecurity/trivy-action@0.26.0
         env:
           TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
@@ -483,7 +506,7 @@ jobs:
 
       - # === Configure AWS credentials ==
         name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
           role-session-name: ${{ env.AWS_ROLE_SESSION_NAME }}
@@ -511,3 +534,4 @@ jobs:
             session-build-ubuntu-20.04
             session-build-macos-11
             session-build-windows-2019
+            session-build-ubuntu-24.04-arm

.github/deps/Linux/arm64/bin/parallelize

@@ -1,6 +1,7 @@
 scripts:
   - name: generate-api-client
     language: bash
+    standalone: true
     description: Generates the mono-api client files
     value: |
       echo "IMPORTANT!!! mono API and inventory API have to be in sync.  Consider running state run generate-inventory-client"
@@ -10,6 +11,7 @@ scripts:
       popd
   - name: generate-secrets-client
     language: bash
+    standalone: true
     description: Generates the secrets-api client files
     value: |
       WD=$(pwd)
@@ -18,6 +20,7 @@ scripts:
       popd
   - name: generate-headchef-client
     language: bash
+    standalone: true
     description: Generates the headchef-api client files
     value: |
       WD=$(pwd)
@@ -26,6 +29,7 @@ scripts:
       popd
   - name: generate-logstreamer-client
     language: bash
+    standalone: true
     description: Generates the buildlog-streamer client files
     value: |
       WD=$(pwd)
@@ -34,6 +38,7 @@ scripts:
       popd
   - name: generate-inventory-client
     language: bash
+    standalone: true
     description: Generates the inventory-api client files
     value: |
       echo "IMPORTANT!!! mono API and inventory API have to be in sync.  Consider running state run generate-api-client"
@@ -43,6 +48,7 @@ scripts:
       popd
   - name: generate-clients
     language: bash
+    standalone: true
     description: Generates all api clients
     value: |
       $scripts.generate-api-client.path()
@@ -55,6 +61,7 @@ scripts:
     value: python3 scripts/locale-generator.py
   - name: generate-payload
     language: bash
+    standalone: true
     description: Generate payload for installer / update archives
     value: |
       set -e
@@ -64,10 +71,10 @@ scripts:
       go run ./scripts/ci/payload-generator/main.go "$@"
   - name: generate-update
     language: bash
+    standalone: true
     description: Generate update files
     value: |
       set -e
-      export GOARCH=${1:-amd64}
       $constants.SET_ENV
 
       $scripts.generate-payload.path()
@@ -79,9 +86,11 @@ scripts:
       go run scripts/ci/update-generator/main.go -o ./build/update
   - name: generate-remote-install-deployment
     language: bash
+    standalone: true
     value: go run scripts/ci/deploy-generator/remote-installer/main.go "$@"
   - name: generate-graph
     language: bash
+    standalone: true
     description: Generates graph server and client files
     value: |
       set -e

.github/deps/Windows/bin/parallelize.exe …b/deps/Windows/amd64/bin/parallelize.exe.github/deps/Windows/bin/parallelize.exe renamed to .github/deps/Windows/amd64/bin/parallelize.exe .github/deps/Windows/bin/parallelize.exe renamed to .github/deps/Windows/amd64/bin/parallelize.exe

@@ -72,16 +72,9 @@ scripts:
         echo "goversioninfo was not found on your PATH. Installing .."
         GOFLAGS="" go install github.com/josephspurrier/goversioninfo/cmd/goversioninfo@v1.4.0
       fi
-  - name: install-deps-os
-    language: bash
-    standalone: true
-    if: ne .OS.Name "Linux"
-    description: Install OS specific deps
-    value: ""
   - name: install-deps-ci
     language: bash
     standalone: true
-    if: ne .Shell "cmd"
     value: |
       if { [[ "$GOOS" == "windows" ]] || [[ "$OS" == "Windows_NT" ]]; } && ! type "goversioninfo" &> /dev/null; then
         echo "goversioninfo was not found on your PATH. Installing .."
@@ -114,17 +107,6 @@ scripts:
         popd > /dev/null
       fi
       go build -tags "$GO_BUILD_TAGS" -o $BUILD_TARGET_DIR/$constants.BUILD_TARGET $constants.CLI_BUILDFLAGS $constants.CLI_PKGS
-  - name: build-for
-    language: bash
-    standalone: true
-    description: Builds the project with the specified OS as the target OS. (valid values darwin, linux, windows)
-    value: |
-      set -e
-      $constants.SET_ENV
-      export GOOS=${1}
-      export GOARCH=amd64
-      [ -z "${2}" ] && >&2 echo "must provide output file as 2nd arg" && exit 1
-      go build -tags "internal $GO_BUILD_TAGS" -o ${2} $constants.CLI_BUILDFLAGS $constants.CLI_PKGS
   - name: build-svc
     language: bash
     standalone: true
@@ -260,46 +242,10 @@ scripts:
     standalone: true
     description: Generates our github workflows
     value: |
-      $scripts.build-for.path() "windows" ./.github/deps/Windows/bin/state.exe
-      $scripts.build-for.path() "linux" ./.github/deps/Linux/bin/state
-      $scripts.build-for.path() "darwin" ./.github/deps/macOS/bin/state
-
-      GOOS=windows go build -o .github/deps/Windows/bin/parallelize.exe github.com/ActiveState/cli/scripts/ci/parallelize/
-      GOOS=linux go build -o .github/deps/Linux/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
-      GOOS=darwin go build -o .github/deps/macOS/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
-  - name: update-workflow-assets
-    language: bash
-    standalone: true
-    description: Generates our github workflows
-    value: |
-      [ -z "${2}" ] && >&2 echo "Usage: update-workflow-assets [branch] [version]" && exit 1
-
-      tmpDir=$(mktemp -d)
-      pushd $tmpDir
-      wget https://state-tool.s3.amazonaws.com/update/state/${1}/${2}/darwin-amd64/state-darwin-amd64-${2}.tar.gz
-      tar xzf state-darwin-amd64-${2}.tar.gz
-      cp -Rfv state-install/bin/state $project.path()/.github/deps/macOS/bin
-      cp -Rfv state-install/bin/state-svc $project.path()/.github/deps/macOS/bin
-      popd
-      rm -Rf $tmpDir
-
-      tmpDir=$(mktemp -d)
-      pushd $tmpDir
-      wget https://state-tool.s3.amazonaws.com/update/state/${1}/${2}/linux-amd64/state-linux-amd64-${2}.tar.gz
-      tar xzf state-linux-amd64-${2}.tar.gz
-      cp -Rfv state-install/bin/state $project.path()/.github/deps/Linux/bin
-      cp -Rfv state-install/bin/state-svc $project.path()/.github/deps/Linux/bin
-      popd
-      rm -Rf $tmpDir
-
-      tmpDir=$(mktemp -d)
-      pushd $tmpDir
-      wget https://state-tool.s3.amazonaws.com/update/state/${1}/${2}/windows-amd64/state-windows-amd64-${2}.zip
-      unzip state-windows-amd64-${2}.zip
-      cp -Rfv state-install/bin/state.exe $project.path()/.github/deps/Windows/bin
-      cp -Rfv state-install/bin/state-svc.exe $project.path()/.github/deps/Windows/bin
-      popd
-      rm -Rf $tmpDir
+      GOOS=windows go build -o .github/deps/Windows/amd64/bin/parallelize.exe github.com/ActiveState/cli/scripts/ci/parallelize/
+      GOOS=linux go build -o .github/deps/Linux/amd64/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
+      GOOS=linux GOARCH=arm64 go build -o .github/deps/Linux/arm64/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
+      GOOS=darwin go build -o .github/deps/macOS/amd64/bin/parallelize github.com/ActiveState/cli/scripts/ci/parallelize/
   - name: test
     language: bash
     standalone: true