From 0b2bd45b7a2c9fba08cb62ece0cd16e3f728823e Mon Sep 17 00:00:00 2001 From: Shad Storhaug Date: Wed, 18 Aug 2021 23:27:22 +0700 Subject: [PATCH 1/3] .github/workflows/Generate-TestWorkflows.ps1: Modified to generate filenames without underscores, because GitHub Actions ignores them --- .github/workflows/Generate-TestWorkflows.ps1 | 9 +++------ ...cene-Net-Tests-_A-D.yml => Lucene-Net-Tests--A-D.yml} | 0 ...cene-Net-Tests-_E-I.yml => Lucene-Net-Tests--E-I.yml} | 0 ...cene-Net-Tests-_I-J.yml => Lucene-Net-Tests--I-J.yml} | 0 ...cene-Net-Tests-_J-S.yml => Lucene-Net-Tests--J-S.yml} | 0 ...cene-Net-Tests-_T-Z.yml => Lucene-Net-Tests--T-Z.yml} | 0 6 files changed, 3 insertions(+), 6 deletions(-) rename .github/workflows/{Lucene-Net-Tests-_A-D.yml => Lucene-Net-Tests--A-D.yml} (100%) rename .github/workflows/{Lucene-Net-Tests-_E-I.yml => Lucene-Net-Tests--E-I.yml} (100%) rename .github/workflows/{Lucene-Net-Tests-_I-J.yml => Lucene-Net-Tests--I-J.yml} (100%) rename .github/workflows/{Lucene-Net-Tests-_J-S.yml => Lucene-Net-Tests--J-S.yml} (100%) rename .github/workflows/{Lucene-Net-Tests-_T-Z.yml => Lucene-Net-Tests--T-Z.yml} (100%) diff --git a/.github/workflows/Generate-TestWorkflows.ps1 b/.github/workflows/Generate-TestWorkflows.ps1 index aeac4034eb..38a0d28230 100644 --- a/.github/workflows/Generate-TestWorkflows.ps1 +++ b/.github/workflows/Generate-TestWorkflows.ps1 @@ -1,4 +1,4 @@ -# ----------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------------- # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -100,9 +100,6 @@ function Get-ProjectDependencies([string]$ProjectPath, [string]$RelativeRoot, [S $rootPath = [System.IO.Path]::GetDirectoryName($resolvedProjectPath) [xml]$project = Get-Content $resolvedProjectPath foreach ($name in $project.SelectNodes("//Project/ItemGroup/ProjectReference") | ForEach-Object { $_.Include -split ';'}) { - #Write-Host "$rootPath" - #Write-Host "$name" - #Write-Host [System.IO.Path]::Combine($rootPath, $name) $dependencyFullPath = [System.IO.Path]::GetFullPath([System.IO.Path]::Combine($rootPath, $name)) Get-ProjectDependencies $dependencyFullPath $RelativeRoot $Result $dependency = Resolve-RelativePath $RelativeRoot $dependencyFullPath @@ -269,9 +266,9 @@ jobs: path: '`${{github.workspace}}/`${{env.test_results_artifact_name}}' " - # GitHub Actions does not support filenames with "." in them, so replace + # GitHub Actions does not support filenames with "." or "_" in them, so replace # with "-" - $projectFileName = $projectName -replace '\.', '-' + $projectFileName = $projectName -replace '\.|_', '-' $FilePath = "$OutputDirectory/$projectFileName.yml" #$dir = [System.IO.Path]::GetDirectoryName($File) diff --git a/.github/workflows/Lucene-Net-Tests-_A-D.yml b/.github/workflows/Lucene-Net-Tests--A-D.yml similarity index 100% rename from .github/workflows/Lucene-Net-Tests-_A-D.yml rename to .github/workflows/Lucene-Net-Tests--A-D.yml diff --git a/.github/workflows/Lucene-Net-Tests-_E-I.yml b/.github/workflows/Lucene-Net-Tests--E-I.yml similarity index 100% rename from .github/workflows/Lucene-Net-Tests-_E-I.yml rename to .github/workflows/Lucene-Net-Tests--E-I.yml diff --git a/.github/workflows/Lucene-Net-Tests-_I-J.yml b/.github/workflows/Lucene-Net-Tests--I-J.yml similarity index 100% rename from .github/workflows/Lucene-Net-Tests-_I-J.yml rename to .github/workflows/Lucene-Net-Tests--I-J.yml diff --git a/.github/workflows/Lucene-Net-Tests-_J-S.yml b/.github/workflows/Lucene-Net-Tests--J-S.yml similarity index 100% rename from .github/workflows/Lucene-Net-Tests-_J-S.yml rename to .github/workflows/Lucene-Net-Tests--J-S.yml diff --git a/.github/workflows/Lucene-Net-Tests-_T-Z.yml b/.github/workflows/Lucene-Net-Tests--T-Z.yml similarity index 100% rename from .github/workflows/Lucene-Net-Tests-_T-Z.yml rename to .github/workflows/Lucene-Net-Tests--T-Z.yml From fde09682d50fd6987292726c1627f3e67771963a Mon Sep 17 00:00:00 2001 From: Shad Storhaug Date: Wed, 18 Aug 2021 23:42:49 +0700 Subject: [PATCH 2/3] fixup test workflows.ps1 --- .github/workflows/Generate-TestWorkflows.ps1 | 6 +++--- .../{Lucene-Net-Tests--A-D.yml => Lucene-Net-Tests-A-D.yml} | 0 .../{Lucene-Net-Tests--E-I.yml => Lucene-Net-Tests-E-I.yml} | 0 .../{Lucene-Net-Tests--I-J.yml => Lucene-Net-Tests-I-J.yml} | 0 .../{Lucene-Net-Tests--J-S.yml => Lucene-Net-Tests-J-S.yml} | 0 .../{Lucene-Net-Tests--T-Z.yml => Lucene-Net-Tests-T-Z.yml} | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename .github/workflows/{Lucene-Net-Tests--A-D.yml => Lucene-Net-Tests-A-D.yml} (100%) rename .github/workflows/{Lucene-Net-Tests--E-I.yml => Lucene-Net-Tests-E-I.yml} (100%) rename .github/workflows/{Lucene-Net-Tests--I-J.yml => Lucene-Net-Tests-I-J.yml} (100%) rename .github/workflows/{Lucene-Net-Tests--J-S.yml => Lucene-Net-Tests-J-S.yml} (100%) rename .github/workflows/{Lucene-Net-Tests--T-Z.yml => Lucene-Net-Tests-T-Z.yml} (100%) diff --git a/.github/workflows/Generate-TestWorkflows.ps1 b/.github/workflows/Generate-TestWorkflows.ps1 index 38a0d28230..0ca7a5e51f 100644 --- a/.github/workflows/Generate-TestWorkflows.ps1 +++ b/.github/workflows/Generate-TestWorkflows.ps1 @@ -1,4 +1,4 @@ -# ----------------------------------------------------------------------------------- +# ----------------------------------------------------------------------------------- # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -267,8 +267,8 @@ jobs: " # GitHub Actions does not support filenames with "." or "_" in them, so replace - # with "-" - $projectFileName = $projectName -replace '\.|_', '-' + # with "-" and "" respectively + $projectFileName = $projectName -replace '\.', '-' -replace '_', '' $FilePath = "$OutputDirectory/$projectFileName.yml" #$dir = [System.IO.Path]::GetDirectoryName($File) diff --git a/.github/workflows/Lucene-Net-Tests--A-D.yml b/.github/workflows/Lucene-Net-Tests-A-D.yml similarity index 100% rename from .github/workflows/Lucene-Net-Tests--A-D.yml rename to .github/workflows/Lucene-Net-Tests-A-D.yml diff --git a/.github/workflows/Lucene-Net-Tests--E-I.yml b/.github/workflows/Lucene-Net-Tests-E-I.yml similarity index 100% rename from .github/workflows/Lucene-Net-Tests--E-I.yml rename to .github/workflows/Lucene-Net-Tests-E-I.yml diff --git a/.github/workflows/Lucene-Net-Tests--I-J.yml b/.github/workflows/Lucene-Net-Tests-I-J.yml similarity index 100% rename from .github/workflows/Lucene-Net-Tests--I-J.yml rename to .github/workflows/Lucene-Net-Tests-I-J.yml diff --git a/.github/workflows/Lucene-Net-Tests--J-S.yml b/.github/workflows/Lucene-Net-Tests-J-S.yml similarity index 100% rename from .github/workflows/Lucene-Net-Tests--J-S.yml rename to .github/workflows/Lucene-Net-Tests-J-S.yml diff --git a/.github/workflows/Lucene-Net-Tests--T-Z.yml b/.github/workflows/Lucene-Net-Tests-T-Z.yml similarity index 100% rename from .github/workflows/Lucene-Net-Tests--T-Z.yml rename to .github/workflows/Lucene-Net-Tests-T-Z.yml From 64d20b94518886e957c8d100cac869d246fcc5fc Mon Sep 17 00:00:00 2001 From: Shad Storhaug Date: Wed, 18 Aug 2021 23:53:08 +0700 Subject: [PATCH 3/3] No-op change to test GitHub Actions --- .../Search/TestControlledRealTimeReopenThread.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs index e769ce7037..3a82d9d893 100644 --- a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs +++ b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs @@ -735,4 +735,4 @@ public override void Run() } } } -} \ No newline at end of file +}