From 14c8bbd3270c8967a3e810b5954748d0807cb846 Mon Sep 17 00:00:00 2001 From: "M.P. Korstanje" Date: Thu, 10 Aug 2023 18:32:37 +0200 Subject: [PATCH] Move tests into test directory to avoid conflicts with polyglot-release (#6) --- .github/workflows/test.yaml | 10 +++++++--- .gitignore | 1 + {dotnet => test}/.gitattributes | 0 {dotnet => test}/.gitignore | 1 - {dotnet => test}/CukeDummy.TestReleaseAutomation.sln | 0 .../CukeDummy.TestReleaseAutomation/Class1.cs | 0 .../CukeDummy.TestReleaseAutomation.csproj | 0 7 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 .gitignore rename {dotnet => test}/.gitattributes (100%) rename {dotnet => test}/.gitignore (99%) rename {dotnet => test}/CukeDummy.TestReleaseAutomation.sln (100%) rename {dotnet => test}/CukeDummy.TestReleaseAutomation/Class1.cs (100%) rename {dotnet => test}/CukeDummy.TestReleaseAutomation/CukeDummy.TestReleaseAutomation.csproj (100%) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 98e8d38..db1e364 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,10 +1,14 @@ name: Test on: + workflow_call: + pull_request: + branches: + - main push: branches: - main - - renovate/* + - renovate/** jobs: test-publish-nuget: @@ -18,9 +22,9 @@ jobs: dotnet-version: 6.0.x - name: Set unique package version run: echo "VERSION=0.0.${GITHUB_RUN_NUMBER}-pre" >> $GITHUB_ENV - working-directory: "dotnet" + working-directory: "test" - name: Test the action uses: ./ with: nuget-api-key: ${{ secrets.NUGET_API_KEY }} - working-directory: dotnet + working-directory: "test" diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..62c8935 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ \ No newline at end of file diff --git a/dotnet/.gitattributes b/test/.gitattributes similarity index 100% rename from dotnet/.gitattributes rename to test/.gitattributes diff --git a/dotnet/.gitignore b/test/.gitignore similarity index 99% rename from dotnet/.gitignore rename to test/.gitignore index 8a8e919..c3e61b5 100644 --- a/dotnet/.gitignore +++ b/test/.gitignore @@ -44,7 +44,6 @@ build/ *.vssscc .builds *.pidb -*.log *.scc # Visual C++ cache files diff --git a/dotnet/CukeDummy.TestReleaseAutomation.sln b/test/CukeDummy.TestReleaseAutomation.sln similarity index 100% rename from dotnet/CukeDummy.TestReleaseAutomation.sln rename to test/CukeDummy.TestReleaseAutomation.sln diff --git a/dotnet/CukeDummy.TestReleaseAutomation/Class1.cs b/test/CukeDummy.TestReleaseAutomation/Class1.cs similarity index 100% rename from dotnet/CukeDummy.TestReleaseAutomation/Class1.cs rename to test/CukeDummy.TestReleaseAutomation/Class1.cs diff --git a/dotnet/CukeDummy.TestReleaseAutomation/CukeDummy.TestReleaseAutomation.csproj b/test/CukeDummy.TestReleaseAutomation/CukeDummy.TestReleaseAutomation.csproj similarity index 100% rename from dotnet/CukeDummy.TestReleaseAutomation/CukeDummy.TestReleaseAutomation.csproj rename to test/CukeDummy.TestReleaseAutomation/CukeDummy.TestReleaseAutomation.csproj