From 6ec8b5b1a6a73c391cc556b930cfe0acbdad205f Mon Sep 17 00:00:00 2001
From: Emily Curry <emily.curry@doppler.com>
Date: Fri, 20 Mar 2026 16:59:22 -0500
Subject: [PATCH 1/3] Add tests for more GHA runner images

---
 .github/workflows/install.yml | 58 ++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index 2a71d67f..ca5c88f8 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -1,20 +1,15 @@
 name: Test install.sh
 
-on: [push]
+on: 
+  pull_request:
+  push:
+    branches:
+      - master
+
+permissions:
+  contents: read
 
 jobs:
-  ubuntu-bash:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v1
-      with:
-        path: ./src/github.com/${{ github.repository }}
-    - name: Install CLI
-      shell: bash
-      run: sudo ./scripts/install.sh --debug
-    - name: Test CLI
-      run: doppler --version
   ubuntu-sh:
     runs-on: ubuntu-latest
     steps:
@@ -127,7 +122,7 @@ jobs:
       run: sudo ./scripts/install.sh --debug --no-package-manager --install-path ./tmp
     - name: Test CLI
       run: ./tmp/doppler --version
-  macOS:
+  macOS-no-install:
     runs-on: macos-latest
     steps:
     - name: Checkout
@@ -135,22 +130,43 @@ jobs:
       with:
         path: ./src/github.com/${{ github.repository }}
     - name: Install CLI
-      run: ./scripts/install.sh --debug
+      run: ./scripts/install.sh --debug --no-install
+    - name: Verify file existence
+      run: ls -l ./doppler
+  ubuntu:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, ubuntu-24.04, ubuntu-22.04, ubuntu-24.04-arm, ubuntu-22.04-arm]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+      with:
+        path: ./src/github.com/${{ github.repository }}
+    - name: Install CLI
+      shell: bash
+      run: sudo ./scripts/install.sh --debug
     - name: Test CLI
       run: doppler --version
-  macOS-no-install:
-    runs-on: macos-latest
+  macOS:
+    strategy:
+      matrix:
+        os: [macos-latest, macos-26, macos-26-intel, macos-15-intel, macos-15, macos-14-large, macos-14]
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
       uses: actions/checkout@v1
       with:
         path: ./src/github.com/${{ github.repository }}
     - name: Install CLI
-      run: ./scripts/install.sh --debug --no-install
-    - name: Verify file existence
-      run: ls -l ./doppler
+      run: ./scripts/install.sh --debug
+    - name: Test CLI
+      run: doppler --version
   windows:
-    runs-on: windows-latest
+    strategy:
+      matrix:
+        os: [windows-latest, windows-2025, windows-2022, windows-11-arm]
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
       uses: actions/checkout@v1

From f9dbd2733025dbb004f6ebc63a46bec84587ac74 Mon Sep 17 00:00:00 2001
From: Emily Curry <emily.curry@doppler.com>
Date: Fri, 20 Mar 2026 17:35:09 -0500
Subject: [PATCH 2/3] Remove --retry-all-errors flag in curl download

This command does not work with output redirection, per the curl
manpage.
---
 scripts/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index e89e2607..530caa30 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -146,7 +146,7 @@ curl_download() {
 
   # allow curl to fail w/o exiting
   set +e
-  headers=$(curl --tlsv1.2 --proto "=https" -w "%{http_code}" --silent --connect-timeout 10 --max-time 60 --retry 5 --retry-all-errors -o "$output_file" -LN -D - "$url" 2>&1)
+  headers=$(curl --tlsv1.2 --proto "=https" -w "%{http_code}" --silent --connect-timeout 10 --max-time 60 --retry 5 -o "$output_file" -LN -D - "$url" 2>&1)
   exit_code=$?
   set -e
 

From d9866fece3d4af1fb30fd5b6c3ba0e9421530a39 Mon Sep 17 00:00:00 2001
From: Emily Curry <emily.curry@doppler.com>
Date: Fri, 20 Mar 2026 17:45:20 -0500
Subject: [PATCH 3/3] Update CLI action tests to v4

---
 .github/workflows/cli-action.yml | 33 ++++++++++++++------------------
 .github/workflows/test.yml       |  6 +++++-
 .github/workflows/vulncheck.yml  |  2 ++
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/cli-action.yml b/.github/workflows/cli-action.yml
index f650b48a..967d0375 100644
--- a/.github/workflows/cli-action.yml
+++ b/.github/workflows/cli-action.yml
@@ -1,26 +1,21 @@
 name: Test CLI action
 
-on: [push]
+on: 
+  push:
+    branches:
+      - master
+
+permissions:
+  contents: read
 
 jobs:
-  ubuntu:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Install CLI
-      uses: dopplerhq/cli-action@v2
-    - name: Test CLI
-      run: doppler --version
-  windows:
-    runs-on: windows-latest
-    steps:
-    - name: Install CLI
-      uses: dopplerhq/cli-action@v2
-    - name: Test CLI
-      run: doppler --version
-  macOS:
-    runs-on: macos-latest
+  cli-action:
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Install CLI
-      uses: dopplerhq/cli-action@v2
+      uses: dopplerhq/cli-action@v4
     - name: Test CLI
-      run: doppler --version
+      run: doppler --version
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aa12156c..c8e7c66d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,10 @@
 name: Run tests
 
-on: [push, pull_request]
+on: 
+  pull_request:
+  push:
+    branches:
+      - master
 
 jobs:
   e2e:
diff --git a/.github/workflows/vulncheck.yml b/.github/workflows/vulncheck.yml
index 999ec07b..8fef1652 100644
--- a/.github/workflows/vulncheck.yml
+++ b/.github/workflows/vulncheck.yml
@@ -3,6 +3,8 @@ name: Vulncheck
 on:
   pull_request:
   push:
+    branches:
+      - master
 
 permissions:
   contents: read # to fetch code (actions/checkout)