Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/github.com/shirou/gops…
Browse files Browse the repository at this point in the history
…util/v3-3.23.8

* main:
  chore(deps): bump github.com/IBM/sarama in /modules/kafka (#1637)
  chore(deps): bump github.com/ClickHouse/clickhouse-go/v2 (#1625)
  chore(deps): bump github.com/elastic/go-elasticsearch/v8 (#1641)
  chore(deps): bump github.com/tidwall/gjson from 1.16.0 to 1.17.0 in /modules/couchbase and /modules/vault (#1684)
  chore(deps): bump mkdocs from 1.5.2 to 1.5.3 (#1662)
  chore(deps): bump github.com/nats-io/nats.go in /modules/nats (#1657)
  chore(deps): bump k8s.io/apimachinery from 0.28.1 to 0.28.2 and k8s.io/client-go from 0.28.1 to 0.28.2 in /modules/k3s (#1683)
  chore(deps): bump github.com/aws/aws-sdk-go-v2/config from 1.18.39 to 1.18.42 and github.com/aws/aws-sdk-go from 1.45.3 to 1.45.15 and github.com/aws/aws-sdk-go-v2/service/s3 from 1.38.5 to 1.39.0 in /modules/localstack (#1680)
  chore(deps): bump github.com/twmb/franz-go/pkg/kadm from 1.9.0 to 1.9.1 and github.com/twmb/franz-go from 1.14.4 to 1.15.0 in /modules/redpanda (#1682)
  chore(deps): bump cloud.google.com/go/datastore from 1.13.0 to 1.14.0 and google.golang.org/grpc from 1.58.1 to 1.58.2 and cloud.google.com/go/spanner from 1.47.0 to 1.49.0 in /modules/gcloud (#1681)
  feat: add GCloud module (#1670)
  make ryuk timeouts configurable via properties file (#1668)
  chore(deps): bump mkdocs-material from 8.2.7 to 9.3.2 (#1649)
  chore(deps): bump google.golang.org/grpc from 1.57.0 to 1.58.1 and google.golang.org/api from 0.138.0 to 0.142.0 in /examples (#1667)
  feat: support for loading images in the K3s module (#1622)
  • Loading branch information
mdelapenya committed Sep 25, 2023
2 parents cccb568 + acaaaa7 commit ec634ce
Show file tree
Hide file tree
Showing 79 changed files with 1,583 additions and 2,691 deletions.
42 changes: 7 additions & 35 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@ updates:
day: sunday
open-pull-requests-limit: 3
rebase-strategy: disabled
- package-ecosystem: gomod
directory: /examples/bigtable
schedule:
interval: monthly
day: sunday
open-pull-requests-limit: 3
rebase-strategy: disabled
- package-ecosystem: gomod
directory: /examples/cockroachdb
schedule:
Expand All @@ -44,41 +37,13 @@ updates:
day: sunday
open-pull-requests-limit: 3
rebase-strategy: disabled
- package-ecosystem: gomod
directory: /examples/datastore
schedule:
interval: monthly
day: sunday
open-pull-requests-limit: 3
rebase-strategy: disabled
- package-ecosystem: gomod
directory: /examples/firestore
schedule:
interval: monthly
day: sunday
open-pull-requests-limit: 3
rebase-strategy: disabled
- package-ecosystem: gomod
directory: /examples/nginx
schedule:
interval: monthly
day: sunday
open-pull-requests-limit: 3
rebase-strategy: disabled
- package-ecosystem: gomod
directory: /examples/pubsub
schedule:
interval: monthly
day: sunday
open-pull-requests-limit: 3
rebase-strategy: disabled
- package-ecosystem: gomod
directory: /examples/spanner
schedule:
interval: monthly
day: sunday
open-pull-requests-limit: 3
rebase-strategy: disabled
- package-ecosystem: gomod
directory: /examples/toxiproxy
schedule:
Expand Down Expand Up @@ -128,6 +93,13 @@ updates:
day: sunday
open-pull-requests-limit: 3
rebase-strategy: disabled
- package-ecosystem: gomod
directory: /modules/gcloud
schedule:
interval: monthly
day: sunday
open-pull-requests-limit: 3
rebase-strategy: disabled
- package-ecosystem: gomod
directory: /modules/k3s
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-test-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:

- name: golangci-lint
# TODO: Remove each example/module once it passes the golangci-lint
if: ${{ inputs.platform == 'ubuntu-latest' && inputs.go-version == '1.20.x' && !contains(fromJSON('["examples/cockroachdb", "examples/spanner", "examples/toxiproxy", "modules/compose", "modules/pulsar", "modules/redis"]'), inputs.project-directory) }}
if: ${{ inputs.platform == 'ubuntu-latest' && inputs.go-version == '1.20.x' && !contains(fromJSON('["examples/cockroachdb", "examples/toxiproxy", "modules/compose", "modules/pulsar", "modules/redis"]'), inputs.project-directory) }}
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
matrix:
go-version: [1.20.x, 1.x]
platform: [ubuntu-latest, macos-latest]
module: [artemis, clickhouse, compose, couchbase, elasticsearch, k3s, kafka, localstack, mariadb, mongodb, mysql, nats, neo4j, postgres, pulsar, rabbitmq, redis, redpanda, vault]
module: [artemis, clickhouse, compose, couchbase, elasticsearch, gcloud, k3s, kafka, localstack, mariadb, mongodb, mysql, nats, neo4j, postgres, pulsar, rabbitmq, redis, redpanda, vault]
uses: ./.github/workflows/ci-test-go.yml
with:
go-version: ${{ matrix.go-version }}
Expand All @@ -123,7 +123,7 @@ jobs:
needs: test-modules
strategy:
matrix:
module: [bigtable, cockroachdb, consul, datastore, firestore, nginx, pubsub, spanner, toxiproxy]
module: [cockroachdb, consul, nginx, toxiproxy]
uses: ./.github/workflows/ci-test-go.yml
with:
go-version: "1.20.x"
Expand Down
24 changes: 4 additions & 20 deletions .vscode/.testcontainers-go.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
"name": "testcontainers-go",
"path": "../"
},
{
"name": "example / bigtable",
"path": "../examples/bigtable"
},
{
"name": "example / cockroachdb",
"path": "../examples/cockroachdb"
Expand All @@ -17,26 +13,10 @@
"name": "example / consul",
"path": "../examples/consul"
},
{
"name": "example / datastore",
"path": "../examples/datastore"
},
{
"name": "example / firestore",
"path": "../examples/firestore"
},
{
"name": "example / nginx",
"path": "../examples/nginx"
},
{
"name": "example / pubsub",
"path": "../examples/pubsub"
},
{
"name": "example / spanner",
"path": "../examples/spanner"
},
{
"name": "example / toxiproxy",
"path": "../examples/toxiproxy"
Expand All @@ -61,6 +41,10 @@
"name": "module / elasticsearch",
"path": "../modules/elasticsearch"
},
{
"name": "module / gcloud",
"path": "../modules/gcloud"
},
{
"name": "module / k3s",
"path": "../modules/k3s"
Expand Down
4 changes: 2 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ verify_ssl = true
[dev-packages]

[packages]
mkdocs = "==1.5.2"
mkdocs = "==1.5.3"
mkdocs-codeinclude-plugin = "==0.2.1"
mkdocs-include-markdown-plugin = "==6.0.1"
mkdocs-material = "==9.2.8"
mkdocs-material = "==9.3.2"
mkdocs-markdownextradata-plugin = "==0.2.5"

[requires]
Expand Down
Loading

0 comments on commit ec634ce

Please sign in to comment.