Merge v1.20 into master (#1634)

mongodb · Sep 5, 2024 · 87c9104 · 87c9104
2 parents 5c4c373 + 17624af
commit 87c9104
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/arginfo-files.yml b/.github/workflows/arginfo-files.yml
@@ -12,16 +12,14 @@ on:
       - "master"
       - "feature/*"
 
+env:
+  PHP_VERSION: "8.2"
+
 jobs:
   check-arginfo:
     name: "Check generated arginfo files"
     runs-on: "ubuntu-20.04"
 
-    strategy:
-      matrix:
-        php-version:
-          - "8.2"
-
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4"
@@ -31,7 +29,7 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "${{ matrix.php-version }}"
+          php-version: "${{ env.PHP_VERSION }}"
 
       - name: "Run phpize"
         run: phpize

diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
@@ -12,16 +12,14 @@ on:
       - "master"
       - "feature/*"
 
+env:
+  PHP_VERSION: "7.4"
+
 jobs:
   coding-standards:
     name: "Coding Standards"
     runs-on: "ubuntu-20.04"
 
-    strategy:
-      matrix:
-        php-version:
-          - "7.4"
-
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4"
@@ -31,7 +29,7 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "${{ matrix.php-version }}"
+          php-version: "${{ env.PHP_VERSION }}"
 
       - name: "Configure driver"
         run: .github/workflows/configure.sh