Improve godemo dep handling

elisasre · Dec 2, 2024 · 401800c · 401800c
1 parent a65ddc6
commit 401800c
Show file tree

Hide file tree

Showing 25 changed files with 18 additions and 1,684 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,8 +10,3 @@ updates:
   schedule:
     interval: "weekly"
     day: "sunday"
-- package-ecosystem: "gomod"
-  directory: "/godemo"
-  schedule:
-    interval: "weekly"
-    day: "sunday"
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -14,7 +14,7 @@ on:
 
 defaults:
   run:
-    working-directory: ./godemo
+    working-directory: ./testdata/godemo
 
 jobs:
   base-build:
@@ -46,12 +46,21 @@ jobs:
 
       - name: Verify dependencies
         run: |
+          cd ../../
           go mod tidy
-          git diff --exit-code -- ../go.mod ../go.sum ./go.mod ./go.sum || (echo "Deps are not up to date: run 'go mod tidy' before commit" && exit 1)
+          git diff --exit-code -- ./go.mod ./go.sum || (echo "Deps are not up to date: run 'go mod tidy' before commit" && exit 1)
+          
+      - name: Prepare demo project
+        run: go mod tidy
+
+      - name: Verify tidy check
+        run: |
+          if mage go:tidyAndVerify; then
+            echo "mage go:tidyAndVerify should have failed"
+            exit 1
+          fi
 
       - run: mage go:lint
-      - run: mage go:tidy
-      - run: mage go:tidyAndVerify
 
       - name: Unit tests
         run: |

diff --git a/godemo/go.mod b/godemo/go.mod
diff --git a/godemo/go.sum b/godemo/go.sum
diff --git a/godemo/.gitignore → testdata/godemo/.gitignore b/godemo/.gitignore → testdata/godemo/.gitignore
diff --git a/godemo/Dockerfile → testdata/godemo/Dockerfile b/godemo/Dockerfile → testdata/godemo/Dockerfile
diff --git a/godemo/README.md → testdata/godemo/README.md b/godemo/README.md → testdata/godemo/README.md
diff --git a/godemo/api/api.go → testdata/godemo/api/api.go b/godemo/api/api.go → testdata/godemo/api/api.go
diff --git a/godemo/api/api_test.go → testdata/godemo/api/api_test.go b/godemo/api/api_test.go → testdata/godemo/api/api_test.go
diff --git a/godemo/app/app.go → testdata/godemo/app/app.go b/godemo/app/app.go → testdata/godemo/app/app.go
diff --git a/godemo/cmd/godemo/main.go → testdata/godemo/cmd/godemo/main.go b/godemo/cmd/godemo/main.go → testdata/godemo/cmd/godemo/main.go
diff --git a/godemo/docs/docs.go → testdata/godemo/docs/docs.go b/godemo/docs/docs.go → testdata/godemo/docs/docs.go
diff --git a/godemo/docs/spec.go → testdata/godemo/docs/spec.go b/godemo/docs/spec.go → testdata/godemo/docs/spec.go
diff --git a/godemo/docs/spec_test.go → testdata/godemo/docs/spec_test.go b/godemo/docs/spec_test.go → testdata/godemo/docs/spec_test.go
diff --git a/godemo/docs/swagger.json → testdata/godemo/docs/swagger.json b/godemo/docs/swagger.json → testdata/godemo/docs/swagger.json
diff --git a/godemo/docs/swagger.yaml → testdata/godemo/docs/swagger.yaml b/godemo/docs/swagger.yaml → testdata/godemo/docs/swagger.yaml
diff --git a/testdata/godemo/go.mod b/testdata/godemo/go.mod
@@ -0,0 +1,5 @@
+module godemo
+
+// Deps will be added in CI to avoid dependabot issues.
+
+replace github.com/elisasre/mageutil => ../../
diff --git a/godemo/integrationtests/integration_test.go → ...demo/integrationtests/integration_test.go b/godemo/integrationtests/integration_test.go → ...demo/integrationtests/integration_test.go
diff --git a/godemo/magefiles/mage.go → testdata/godemo/magefiles/mage.go b/godemo/magefiles/mage.go → testdata/godemo/magefiles/mage.go
diff --git a/godemo/manifests/cdk/package-lock.json → ...ta/godemo/manifests/cdk/package-lock.json b/godemo/manifests/cdk/package-lock.json → ...ta/godemo/manifests/cdk/package-lock.json
diff --git a/godemo/manifests/cdk/package.json → testdata/godemo/manifests/cdk/package.json b/godemo/manifests/cdk/package.json → testdata/godemo/manifests/cdk/package.json
diff --git a/godemo/runner/run.go → testdata/godemo/runner/run.go b/godemo/runner/run.go → testdata/godemo/runner/run.go
diff --git a/godemo/some.yaml → testdata/godemo/some.yaml b/godemo/some.yaml → testdata/godemo/some.yaml
diff --git a/godemo/ui/package-lock.json → testdata/godemo/ui/package-lock.json b/godemo/ui/package-lock.json → testdata/godemo/ui/package-lock.json
diff --git a/godemo/ui/package.json → testdata/godemo/ui/package.json b/godemo/ui/package.json → testdata/godemo/ui/package.json