Skip to content

Commit 5f3c18b

Browse files
authored
Merge branch 'develop' into feature/update-cosmosdb-image-version
2 parents 17d9806 + 7d66ff8 commit 5f3c18b

15 files changed

Lines changed: 53 additions & 90 deletions

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Default owners for all paths in this repository.
22

3-
* @testcontainers/dotnet-team
3+
* @HofmeisterAn
44

55
# Documentation can additionally be reviewed by OSS maintainers.
66

7-
/docs/ @testcontainers/oss-team
7+
/docs/ @testcontainers/dotnet-team

.github/dependabot.yml

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,40 @@ updates:
33
- package-ecosystem: github-actions
44
directory: /
55
schedule:
6-
interval: weekly
6+
interval: monthly
77
labels:
88
- dependencies
9-
- github_actions
109
groups:
1110
actions:
1211
patterns:
1312
- '*'
1413
- package-ecosystem: nuget
1514
directory: /
15+
exclude-paths:
16+
- examples/**
17+
open-pull-requests-limit: 3
1618
schedule:
17-
interval: weekly
19+
interval: monthly
1820
labels:
1921
- dependencies
20-
- nuget
2122
ignore:
22-
- dependency-name: '*'
23-
versions:
24-
- '>= 0'
23+
- dependency-name: Cake.*
24+
update-types:
25+
- version-update:semver-major
26+
- dependency-name: Microsoft.Bcl.*
27+
update-types:
28+
- version-update:semver-major
29+
- dependency-name: Microsoft.Extensions.*
30+
update-types:
31+
- version-update:semver-major
32+
- dependency-name: xunit*
33+
update-types:
34+
- version-update:semver-major
35+
groups:
36+
nuget-patch-minor:
37+
update-types:
38+
- minor
39+
- patch
40+
nuget-major:
41+
update-types:
42+
- major

.github/settings.yml

Lines changed: 1 addition & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ labels:
125125
collaborators:
126126
- username: HofmeisterAn
127127
permission: admin
128+
128129
- username: testcontainersbot
129130
permission: write
130131

@@ -143,77 +144,9 @@ teams:
143144
- name: dotnet-team
144145
permission: admin
145146

146-
- name: oss-team
147-
permission: maintain
148-
149147
# The permission to grant the team. Can be one of:
150148
# * `pull` - can pull, but not push to or administer this repository.
151149
# * `push` - can pull and push, but not administer this repository.
152150
# * `admin` - can pull, push and administer this repository.
153151
# * `maintain` - Recommended for project managers who need to manage the repository without access to sensitive or destructive actions.
154152
# * `triage` - Recommended for contributors who need to proactively manage issues and pull requests without write access.
155-
156-
branches:
157-
- name: main
158-
# https://docs.github.com/en/rest/reference/repos#update-branch-protection
159-
# Branch Protection settings. Set to null to disable
160-
protection:
161-
# Required. Require at least one approving review on a pull request, before merging. Set to null to disable.
162-
required_pull_request_reviews:
163-
# The number of approvals required. (1-6)
164-
required_approving_review_count: 1
165-
# Dismiss approved reviews automatically when a new commit is pushed.
166-
dismiss_stale_reviews: true
167-
# Blocks merge until code owners have reviewed.
168-
require_code_owner_reviews: true
169-
# Specify which users and teams can dismiss pull request reviews. Pass an empty dismissal_restrictions object to disable. User and team dismissal_restrictions are only available for organization-owned repositories. Omit this parameter for personal repositories.
170-
dismissal_restrictions:
171-
users: []
172-
teams: [ dotnet-team ]
173-
# Required. Require status checks to pass before merging. Set to null to disable
174-
required_status_checks:
175-
# Required. Require branches to be up to date before merging.
176-
strict: true
177-
# Required. The list of status checks to require in order to merge into this branch
178-
contexts: ["Test Report", "analyze (csharp)"]
179-
# Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
180-
enforce_admins: false
181-
# Prevent merge commits from being pushed to matching branches
182-
required_linear_history: true
183-
# Required. Restrict who can push to this branch. Team and user restrictions are only available for organization-owned repositories. Set to null to disable.
184-
restrictions:
185-
apps: []
186-
users: []
187-
teams: [ dotnet-team ]
188-
189-
- name: develop
190-
# https://docs.github.com/en/rest/reference/repos#update-branch-protection
191-
# Branch Protection settings. Set to null to disable
192-
protection:
193-
# Required. Require at least one approving review on a pull request, before merging. Set to null to disable.
194-
required_pull_request_reviews:
195-
# The number of approvals required. (1-6)
196-
required_approving_review_count: 1
197-
# Dismiss approved reviews automatically when a new commit is pushed.
198-
dismiss_stale_reviews: true
199-
# Blocks merge until code owners have reviewed.
200-
require_code_owner_reviews: true
201-
# Specify which users and teams can dismiss pull request reviews. Pass an empty dismissal_restrictions object to disable. User and team dismissal_restrictions are only available for organization-owned repositories. Omit this parameter for personal repositories.
202-
dismissal_restrictions:
203-
users: []
204-
teams: [ dotnet-team ]
205-
# Required. Require status checks to pass before merging. Set to null to disable
206-
required_status_checks:
207-
# Required. Require branches to be up to date before merging.
208-
strict: true
209-
# Required. The list of status checks to require in order to merge into this branch
210-
contexts: ["Test Report", "analyze (csharp)"]
211-
# Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
212-
enforce_admins: false
213-
# Prevent merge commits from being pushed to matching branches
214-
required_linear_history: true
215-
# Required. Restrict who can push to this branch. Team and user restrictions are only available for organization-owned repositories. Set to null to disable.
216-
restrictions:
217-
apps: []
218-
users: []
219-
teams: [ dotnet-team ]

.github/workflows/cicd.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,14 @@ jobs:
182182
shell: bash
183183

184184
- name: Attest
185+
if: ${{ env.PUBLISH_NUGET_PACKAGE == 'true' }}
185186
uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0
186187
with:
187-
subject-path: '**/*.nupkg'
188+
subject-path: artifacts/**/nuget/Testcontainers*.nupkg
188189

189190
# Cake sets the semVer environment variable.
190191
- name: Draft Release
191-
uses: release-drafter/release-drafter@6db134d15f3909ccc9eefd369f02bd1e9cffdf97 # v6.2.0
192+
uses: release-drafter/release-drafter@00ce30b0ce8a4d67bccfca59421cdf6c55dd0784 # v6.3.0
192193
with:
193194
version: ${{ env.semVer }}
194195
env:

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ concurrency:
1212
group: ${{ github.workflow }}-${{ github.head_ref || github.sha }}
1313
cancel-in-progress: true
1414

15+
permissions: read-all
16+
1517
jobs:
1618
analyze:
1719
strategy:

.github/workflows/scorecard-analysis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ concurrency:
99
group: ${{ github.workflow }}-${{ github.head_ref || github.sha }}
1010
cancel-in-progress: true
1111

12+
permissions: read-all
13+
1214
jobs:
1315
analyze:
1416
permissions:

.github/workflows/test-report.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
types:
88
- completed
99

10+
permissions: read-all
11+
1012
jobs:
1113
test-report:
1214
permissions:

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<PackageVersion Include="Consul" Version="1.6.10.9"/>
5555
<PackageVersion Include="CouchbaseNetClient" Version="3.7.2"/>
5656
<PackageVersion Include="DotPulsar" Version="3.6.0"/>
57-
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.16.3"/>
57+
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.19.15"/>
5858
<PackageVersion Include="EventStore.Client.Grpc.Streams" Version="23.3.9"/>
5959
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="10.0.0"/>
6060
<PackageVersion Include="Google.Cloud.BigQuery.V2" Version="3.4.0"/>

docs/contributing_docs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ We publish our documentation using Netlify.
1111

1212
### Using Python locally
1313

14-
* Ensure that you have Python 3.8.0 or higher.
14+
* Ensure that you have Python 3.11.0 or higher.
1515
* Set up a virtualenv and run `pip install -r requirements.txt` in the `testcontainers-dotnet` root directory.
1616
* Once Python dependencies have been installed, run `mkdocs serve` to start a local auto-updating MkDocs server.
1717

docs/theme/partials/header.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
class="md-header__inner md-grid"
3737
aria-label="{{ lang.t('header') }}"
3838
>
39-
39+
4040
<!-- Button to open drawer -->
4141
<label class="md-header__button md-icon" for="__drawer">
4242
{% include ".icons/material/menu" ~ ".svg" %}
@@ -124,9 +124,10 @@
124124
{% endif %}
125125

126126
<!-- Button to open search modal -->
127-
{% if "search" in config.plugins %}
127+
{% if "material/search" in config.plugins %}
128128
<label class="md-header__button md-icon" for="__search">
129-
{% include ".icons/material/magnify.svg" %}
129+
{% set icon = config.theme.icon.search or "material/magnify" %}
130+
{% include ".icons/" ~ icon ~ ".svg" %}
130131
</label>
131132

132133
<!-- Search interface -->

0 commit comments

Comments
 (0)