Merge branch version/0-43-0-RC1 to adopt changes from PR #2935

ActiveState · Dec 7, 2023 · caf159f · caf159f
2 parents 6581e9b + 490521a
commit caf159f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 71 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -112,11 +112,6 @@ jobs:
         run: brew install fish
         if: runner.os == 'macOS'
 
-      - # === Install Deps ===
-        name: Install Deps
-        shell: bash
-        run: state run install-deps
-
       - # === Preprocess ===
         name: Preprocess
         shell: bash
@@ -420,16 +415,6 @@ jobs:
         name: Install State Tool
         uses: ActiveState/setup-state-tool@v1
 
-      - # === Setup ===
-        name: Setup
-        shell: bash
-        run: |
-          bin=$(pwd)/.github/deps/${{ runner.os }}/bin
-          echo "Adding $bin to PATH"
-          echo "$bin" >> $GITHUB_PATH
-          ls -ahl $bin
-          printenv
-
       - # === Download All Build Session Artifacts ===
         name: Download All Build Session Artifacts
         uses: actions/download-artifact@v2
@@ -445,11 +430,6 @@ jobs:
           find . -mindepth 2 -maxdepth 2 -print0 | xargs -0 -I file rsync -av file .
           rm -Rf session*
 
-      - # === Install Deps ===
-        name: Install Deps
-        shell: bash
-        run: state run install-deps
-
       - # === Preprocess ===
         name: Preprocess
         shell: bash

diff --git a/.github/workflows/propagate.yml b/.github/workflows/propagate.yml
@@ -13,14 +13,8 @@ jobs:
   propagate:
     name: Propagate to affected version branches
     runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        go-version:
-          - 1.20.x
     env:
       ACTIVESTATE_CI: true
-      ACTIVESTATE_CLI_DISABLE_RUNTIME: true
-      SHELL: bash
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       JIRA_USERNAME: ${{ secrets.JIRA_EMAIL }}
       JIRA_TOKEN: ${{ secrets.JIRA_TOKEN }}
@@ -40,7 +34,7 @@ jobs:
         name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: ${{ matrix.go-version }}
+          go-version: '1.20.x'
 
       - # === Install State Tool ===
         name: Install State Tool
@@ -50,18 +44,10 @@ jobs:
         name: Setup
         shell: bash
         run: |
-          bin=$(pwd)/.github/deps/${{ runner.os }}/bin
-          echo "Adding $bin to PATH"
-          echo "$bin" >> $GITHUB_PATH
           # We specify our custom user because we need privileges to push to protected branches
           git config user.name "AS-builds"
           git config user.email "[email protected]"
 
-      - # === Install Deps ===
-        name: Install Deps
-        shell: bash
-        run: state run install-deps
-
       - # === Preprocess ===
         name: Preprocess
         shell: bash

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,14 +15,8 @@ jobs:
     if: github.event.ref_type == 'tag' && contains(github.event.ref, 'release/remote-installer')
     permissions:
       id-token: write # This is required for requesting the JWT
-    strategy:
-      matrix:
-        go-version:
-          - 1.20.x
     env:
       ACTIVESTATE_CI: true
-      ACTIVESTATE_CLI_DISABLE_RUNTIME: true
-      SHELL: bash
       GITHUB_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       AWS_REGION : "us-east-1"
       AWS_ROLE_SESSION_NAME: "gha-activestate-cli"
@@ -37,31 +31,12 @@ jobs:
         name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: ${{ matrix.go-version }}
+          go-version: '1.20.x'
 
       - # === Install State Tool ===
         name: Install State Tool
         uses: ActiveState/setup-state-tool@v1
 
-      - # === Setup ===
-        name: Setup
-        shell: bash
-        run: |
-          bin=$(pwd)/.github/deps/${{ runner.os }}/bin
-          echo "Adding $bin to PATH"
-          echo "$bin" >> $GITHUB_PATH
-
-      - # === Setup Windows ===
-        name: Setup (Windows)
-        shell: pwsh
-        run: |
-          echo "${PSScriptRoot}/.github/deps/${{ runner.os }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
-      - # === Install Deps ===
-        name: Install Deps
-        shell: bash
-        run: state run install-deps
-
       - # === Preprocess ===
         name: Preprocess
         shell: bash
@@ -88,7 +63,7 @@ jobs:
         env:
           CODE_SIGNING_PASSWD: ${{ secrets.CODE_SIGNING_PASSWD }}
           MSI_CERT_BASE64: ${{ secrets.MSI_CERT_BASE64 }}
-      
+
       - # === Configure AWS credentials ==
         name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2

diff --git a/activestate.yaml b/activestate.yaml
@@ -46,14 +46,6 @@ constants:
     if: ne .OS.Name "Windows"
     value: .sh
 scripts:
-  - name: install-deps
-    language: bash
-    if: ne .Shell "cmd"
-    value: |
-      if ! type "gozip" &> /dev/null; then
-        echo "gozip was not found on your PATH, installing .."
-        go install github.com/ActiveState/gozip/cmd/gozip@e455986
-      fi
   - name: install-deps-dev
     language: bash
     if: ne .Shell "cmd"
@@ -410,7 +402,6 @@ events:
     if: ne .Shell "cmd"
     value: |
       $scripts.install-deps-dev.path()
-      $scripts.install-deps.path()
   - name: file-changed
     scope: ["internal/locale/locales"]
     value: build