Merge branch 'main' into ci-refinements

* main: fix: remove wrong example from workspace (testcontainers#1556)
mdelapenya · Aug 30, 2023 · a364c07 · a364c07
2 parents a06d4f9 + be661b2
commit a364c07
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,11 +7,13 @@ on:
     branches:
       - main
     paths-ignore:
+      - '.vscode/**'
       - 'mkdocs.yml'
       - 'docs/**'
       - 'README.md'
   pull_request:
     paths-ignore:
+      - '.vscode/**'
       - 'mkdocs.yml'
       - 'docs/**'
       - 'README.md'

diff --git a/.vscode/.testcontainers-go.code-workspace b/.vscode/.testcontainers-go.code-workspace
@@ -37,10 +37,6 @@
             "name": "example / pubsub",
             "path": "../examples/pubsub"
         },
-        {
-            "name": "example / questdb",
-            "path": "../examples/questdb"
-        },
         {
             "name": "example / spanner",
             "path": "../examples/spanner"

diff --git a/modulegen/_template/ci.yml.tmpl b/modulegen/_template/ci.yml.tmpl
@@ -7,11 +7,13 @@ on:
     branches:
       - main
     paths-ignore:
+      - '.vscode/**'
       - 'mkdocs.yml'
       - 'docs/**'
       - 'README.md'
   pull_request:
     paths-ignore:
+      - '.vscode/**'
       - 'mkdocs.yml'
       - 'docs/**'
       - 'README.md'

diff --git a/modulegen/main_test.go b/modulegen/main_test.go
@@ -459,11 +459,11 @@ func assertExampleGithubWorkflowContent(t *testing.T, example Example, exampleWo
 
 	modulesList, err := ctx.GetModules()
 	assert.Nil(t, err)
-	assert.Equal(t, "        module: ["+strings.Join(modulesList, ", ")+"]", data[96])
+	assert.Equal(t, "        module: ["+strings.Join(modulesList, ", ")+"]", data[98])
 
 	examplesList, err := ctx.GetExamples()
 	assert.Nil(t, err)
-	assert.Equal(t, "        module: ["+strings.Join(examplesList, ", ")+"]", data[112])
+	assert.Equal(t, "        module: ["+strings.Join(examplesList, ", ")+"]", data[114])
 }
 
 // assert content go.mod