Resolve merge conflicts

Author: prestonvasquez

.evergreen/config.yml

@@ -1,14 +1,12 @@
 review-priority-normal:
-- changed-files:
-  - any-glob-to-any-file: '*'
-
+  - changed-files:
+      - any-glob-to-any-file: "*"
 documentation:
-- changed-files:
-  - any-glob-to-any-file:
-    - docs/**
-    - examples/**
-
+  - changed-files:
+      - any-glob-to-any-file:
+          - docs/**
+          - examples/**
 dependencies:
-- changed-files:
-  - any-glob-to-any-file:
-    - go.mod
+  - changed-files:
+      - any-glob-to-any-file:
+          - go.mod

.github/labeler.yml

@@ -7,7 +7,6 @@ on:
       - reopened
       - labeled
       - unlabeled
-
 jobs:
   check_labels:
     name: Check labels

.github/workflows/check-labels.yml

@@ -1,5 +1,4 @@
 name: "CodeQL"
-
 on:
   push:
     branches:
@@ -16,40 +15,34 @@ on:
       - "release/*"
       - "feature/*"
   schedule:
-    - cron: '36 17 * * 0'
+    - cron: "36 17 * * 0"
   workflow_call:
     inputs:
       ref:
         required: true
         type: string
-
 jobs:
   analyze:
     name: Analyze (go)
-    runs-on: 'ubuntu-latest'
+    runs-on: "ubuntu-latest"
     timeout-minutes: 360
     permissions:
       # required for all workflows
       security-events: write
-
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v6
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
-      with:
-        languages: go
-        build-mode: manual
-
-    - name: Install Taskfile support
-      uses: arduino/setup-task@v2
-
-    - shell: bash
-      run: task build
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
-      with:
-        category: "/language:go"
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v4
+        with:
+          languages: go
+          build-mode: manual
+      - name: Install Taskfile support
+        uses: arduino/setup-task@v2
+      - shell: bash
+        run: task build
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v4
+        with:
+          category: "/language:go"

.github/workflows/codeql.yml

@@ -1,28 +1,24 @@
 name: Create Release Branch
-
 on:
   workflow_dispatch:
     inputs:
-        branch_name:
-          description: The name of the new branch
-          required: true
-        version:
-          description: The version to set on the branch
-          required: true
-        base_ref:
-          description: The base reference for the branch
-        push_changes:
-          description: Whether to push the changes
-          default: "true"
-
+      branch_name:
+        description: The name of the new branch
+        required: true
+      version:
+        description: The version to set on the branch
+        required: true
+      base_ref:
+        description: The base reference for the branch
+      push_changes:
+        description: Whether to push the changes
+        default: "true"
 concurrency:
   group: create-branch-${{ github.ref }}
   cancel-in-progress: true
-
 defaults:
   run:
     shell: bash -eux {0}
-
 jobs:
   create-branch:
     environment: release

.github/workflows/create-release-branch.yml

@@ -1,7 +1,6 @@
 name: "Pull Request Labeler"
 on:
   - pull_request_target
-
 jobs:
   labeler:
     permissions:

.github/workflows/labeler.yml

@@ -1,21 +1,17 @@
 name: Merge up
-
 on:
   push:
     branches:
       - release/*.*
       - v*
-
 permissions:
   id-token: write
   contents: write
   pull-requests: write
-
 jobs:
   merge-up:
     name: Create merge up pull request
     runs-on: ubuntu-latest
-
     steps:
       - uses: mongodb-labs/drivers-github-tools/secure-checkout@v3
         with:
@@ -24,14 +20,13 @@ jobs:
           # Make sure to include fetch-depth 0 so all branches are fetched, not
           # just the current one
           fetch-depth: 0
-
       - name: Create pull request
         id: create-pull-request
         uses: alcaeus/[email protected]
         with:
           ref: ${{ github.ref_name }}
-          branchNamePattern: 'release/<major>.<minor>'
-          devBranchNamePattern: 'v<major>'
-          fallbackBranch: 'master'
+          branchNamePattern: "release/<major>.<minor>"
+          devBranchNamePattern: "v<major>"
+          fallbackBranch: "master"
           ignoredBranches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }}
           enableAutoMerge: true

.github/workflows/merge-up.yml

@@ -1,5 +1,4 @@
 name: Release
-
 on:
   workflow_dispatch:
     inputs:
@@ -13,16 +12,13 @@ on:
         description: "Push changes?"
         default: true
         type: boolean
-
 defaults:
   run:
     shell: bash -eux {0}
-
 env:
   # Changes per branch
   SILK_ASSET_GROUP: mongodb-go-driver
   EVERGREEN_PROJECT: mongo-go-driver
-
 jobs:
   pre-publish:
     environment: release
@@ -50,15 +46,13 @@ jobs:
           version: ${{ inputs.version }}
           push_changes: ${{ inputs.push_changes }}
           ignored_branches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }}
-
   static-scan:
     needs: [pre-publish]
     permissions:
       security-events: write
     uses: ./.github/workflows/codeql.yml
     with:
       ref: ${{ github.ref }}
-
   publish:
     needs: [pre-publish, static-scan]
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -10,13 +10,11 @@ on:
   # To guarantee Maintained check is occasionally updated. See
   # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
   schedule:
-    - cron: '24 21 * * 1'
+    - cron: "24 21 * * 1"
   push:
-    branches: [ "master" ]
-
+    branches: ["master"]
 # Declare default permissions as read only.
 permissions: read-all
-
 jobs:
   analysis:
     name: Scorecard analysis
@@ -31,13 +29,11 @@ jobs:
       # Uncomment the permissions below if installing in a private repository.
       # contents: read
       # actions: read
-
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v6
         with:
           persist-credentials: false
-
       - name: "Run analysis"
         uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
@@ -57,10 +53,8 @@ jobs:
           #   - `publish_results` will always be set to `false`, regardless
           #     of the value entered here.
           publish_results: true
-
           # (Optional) Uncomment file_mode if you have a .gitattributes with files marked export-ignore
           # file_mode: git
-
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
@@ -69,7 +63,6 @@ jobs:
           name: SARIF file
           path: results.sarif
           retention-days: 5
-
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"

.github/workflows/scorecard.yml

@@ -1,17 +1,13 @@
 name: GoDriver Tests
-
 on:
   push:
   pull_request:
-
 concurrency:
   group: test-${{ github.ref }}
   cancel-in-progress: true
-
 defaults:
   run:
     shell: bash -eux {0}
-
 jobs:
   pre_commit:
     runs-on: ubuntu-latest