Skip to content

Commit 4696628

Browse files
Merge branch 'master' into feature/godriver-3690-extend-event-failures-with-error-codes
2 parents f498a53 + ad40e61 commit 4696628

File tree

43 files changed

+713
-687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+713
-687
lines changed

.evergreen/config.yml

Lines changed: 132 additions & 301 deletions
Large diffs are not rendered by default.

.github/labeler.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
review-priority-normal:
2-
- changed-files:
3-
- any-glob-to-any-file: '*'
4-
2+
- changed-files:
3+
- any-glob-to-any-file: "*"
54
documentation:
6-
- changed-files:
7-
- any-glob-to-any-file:
8-
- docs/**
9-
- examples/**
10-
5+
- changed-files:
6+
- any-glob-to-any-file:
7+
- docs/**
8+
- examples/**
119
dependencies:
12-
- changed-files:
13-
- any-glob-to-any-file:
14-
- go.mod
10+
- changed-files:
11+
- any-glob-to-any-file:
12+
- go.mod

.github/workflows/check-labels.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
- reopened
88
- labeled
99
- unlabeled
10-
1110
jobs:
1211
check_labels:
1312
name: Check labels

.github/workflows/codeql.yml

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
name: "CodeQL"
2-
32
on:
43
push:
54
branches:
@@ -16,40 +15,34 @@ on:
1615
- "release/*"
1716
- "feature/*"
1817
schedule:
19-
- cron: '36 17 * * 0'
18+
- cron: "36 17 * * 0"
2019
workflow_call:
2120
inputs:
2221
ref:
2322
required: true
2423
type: string
25-
2624
jobs:
2725
analyze:
2826
name: Analyze (go)
29-
runs-on: 'ubuntu-latest'
27+
runs-on: "ubuntu-latest"
3028
timeout-minutes: 360
3129
permissions:
3230
# required for all workflows
3331
security-events: write
34-
3532
steps:
36-
- name: Checkout repository
37-
uses: actions/checkout@v6
38-
39-
# Initializes the CodeQL tools for scanning.
40-
- name: Initialize CodeQL
41-
uses: github/codeql-action/init@v4
42-
with:
43-
languages: go
44-
build-mode: manual
45-
46-
- name: Install Taskfile support
47-
uses: arduino/setup-task@v2
48-
49-
- shell: bash
50-
run: task build
51-
52-
- name: Perform CodeQL Analysis
53-
uses: github/codeql-action/analyze@v4
54-
with:
55-
category: "/language:go"
33+
- name: Checkout repository
34+
uses: actions/checkout@v6
35+
# Initializes the CodeQL tools for scanning.
36+
- name: Initialize CodeQL
37+
uses: github/codeql-action/init@v4
38+
with:
39+
languages: go
40+
build-mode: manual
41+
- name: Install Taskfile support
42+
uses: arduino/setup-task@v2
43+
- shell: bash
44+
run: task build
45+
- name: Perform CodeQL Analysis
46+
uses: github/codeql-action/analyze@v4
47+
with:
48+
category: "/language:go"

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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
name: Create Release Branch
2-
32
on:
43
workflow_dispatch:
54
inputs:
6-
branch_name:
7-
description: The name of the new branch
8-
required: true
9-
version:
10-
description: The version to set on the branch
11-
required: true
12-
base_ref:
13-
description: The base reference for the branch
14-
push_changes:
15-
description: Whether to push the changes
16-
default: "true"
17-
5+
branch_name:
6+
description: The name of the new branch
7+
required: true
8+
version:
9+
description: The version to set on the branch
10+
required: true
11+
base_ref:
12+
description: The base reference for the branch
13+
push_changes:
14+
description: Whether to push the changes
15+
default: "true"
1816
concurrency:
1917
group: create-branch-${{ github.ref }}
2018
cancel-in-progress: true
21-
2219
defaults:
2320
run:
2421
shell: bash -eux {0}
25-
2622
jobs:
2723
create-branch:
2824
environment: release

.github/workflows/labeler.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: "Pull Request Labeler"
22
on:
33
- pull_request_target
4-
54
jobs:
65
labeler:
76
permissions:

.github/workflows/merge-up.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
name: Merge up
2-
32
on:
43
push:
54
branches:
65
- release/*.*
76
- v*
8-
97
permissions:
108
id-token: write
119
contents: write
1210
pull-requests: write
13-
1411
jobs:
1512
merge-up:
1613
name: Create merge up pull request
1714
runs-on: ubuntu-latest
18-
1915
steps:
2016
- uses: mongodb-labs/drivers-github-tools/secure-checkout@v3
2117
with:
@@ -24,14 +20,13 @@ jobs:
2420
# Make sure to include fetch-depth 0 so all branches are fetched, not
2521
# just the current one
2622
fetch-depth: 0
27-
2823
- name: Create pull request
2924
id: create-pull-request
3025
uses: alcaeus/automatic-merge-up-action@1.0.1
3126
with:
3227
ref: ${{ github.ref_name }}
33-
branchNamePattern: 'release/<major>.<minor>'
34-
devBranchNamePattern: 'v<major>'
35-
fallbackBranch: 'master'
28+
branchNamePattern: "release/<major>.<minor>"
29+
devBranchNamePattern: "v<major>"
30+
fallbackBranch: "master"
3631
ignoredBranches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }}
3732
enableAutoMerge: true

.github/workflows/release.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
name: Release
2-
32
on:
43
workflow_dispatch:
54
inputs:
@@ -13,16 +12,13 @@ on:
1312
description: "Push changes?"
1413
default: true
1514
type: boolean
16-
1715
defaults:
1816
run:
1917
shell: bash -eux {0}
20-
2118
env:
2219
# Changes per branch
2320
SILK_ASSET_GROUP: mongodb-go-driver
2421
EVERGREEN_PROJECT: mongo-go-driver
25-
2622
jobs:
2723
pre-publish:
2824
environment: release
@@ -50,15 +46,13 @@ jobs:
5046
version: ${{ inputs.version }}
5147
push_changes: ${{ inputs.push_changes }}
5248
ignored_branches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }}
53-
5449
static-scan:
5550
needs: [pre-publish]
5651
permissions:
5752
security-events: write
5853
uses: ./.github/workflows/codeql.yml
5954
with:
6055
ref: ${{ github.ref }}
61-
6256
publish:
6357
needs: [pre-publish, static-scan]
6458
runs-on: ubuntu-latest

.github/workflows/scorecard.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ on:
1010
# To guarantee Maintained check is occasionally updated. See
1111
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
1212
schedule:
13-
- cron: '24 21 * * 1'
13+
- cron: "24 21 * * 1"
1414
push:
15-
branches: [ "master" ]
16-
15+
branches: ["master"]
1716
# Declare default permissions as read only.
1817
permissions: read-all
19-
2018
jobs:
2119
analysis:
2220
name: Scorecard analysis
@@ -31,13 +29,11 @@ jobs:
3129
# Uncomment the permissions below if installing in a private repository.
3230
# contents: read
3331
# actions: read
34-
3532
steps:
3633
- name: "Checkout code"
3734
uses: actions/checkout@v6
3835
with:
3936
persist-credentials: false
40-
4137
- name: "Run analysis"
4238
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
4339
with:
@@ -57,10 +53,8 @@ jobs:
5753
# - `publish_results` will always be set to `false`, regardless
5854
# of the value entered here.
5955
publish_results: true
60-
6156
# (Optional) Uncomment file_mode if you have a .gitattributes with files marked export-ignore
6257
# file_mode: git
63-
6458
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6559
# format to the repository Actions tab.
6660
- name: "Upload artifact"
@@ -69,7 +63,6 @@ jobs:
6963
name: SARIF file
7064
path: results.sarif
7165
retention-days: 5
72-
7366
# Upload the results to GitHub's code scanning dashboard (optional).
7467
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7568
- name: "Upload to code-scanning"

.github/workflows/test.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
name: GoDriver Tests
2-
32
on:
43
push:
54
pull_request:
6-
75
concurrency:
86
group: test-${{ github.ref }}
97
cancel-in-progress: true
10-
118
defaults:
129
run:
1310
shell: bash -eux {0}
14-
1511
jobs:
1612
pre_commit:
1713
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)