Merge pull request #2414 from AdmiringWorm/community-validation

(maint) Add Chocolatey Community Validation Extension to build script
chocolatey-community · Jan 19, 2024 · 97d9ef4 · 97d9ef4
2 parents b0dc770 + 8cc2f69
commit 97d9ef4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -62,6 +62,7 @@ install:
       'wormies-au-helpers' = '0.4.1'
       'chocolatey-core.extension' = '1.4.0'
       'autohotkey.install' = '1.1.35.00'
+      'chocolatey-community-validation.extension' = '0.1.0'
     }.GetEnumerator() | % {
       if (!(Test-Path "${env:nupkg_cache_path}\$($_.Key).$($_.Value).nupkg")) { rm "${env:nupkg_cache_path}\$($_.Key).*.nupkg" ; iwr "https://chocolatey.org/api/v2/package/$($_.Key)/$($_.Value)" -OutFile "${env:nupkg_cache_path}\$($_.Key).$($_.Value).nupkg" }
       if ($_.Key -eq 'chocolatey') { cup $_.Key --version $_.Value --source ${env:nupkg_cache_path} --allow-downgrade --pre }

diff --git a/scripts/Update-IconUrl.ps1 b/scripts/Update-IconUrl.ps1
@@ -113,7 +113,7 @@ if (!$GithubRepository) {
   if ($remoteName) { $remoteUrl = . git remote get-url $remoteName }
 
   if ($remoteUrl) {
-    $GithubRepository = ($remoteUrl -split '\/' | select -last 2) -replace '\.git$','' -join '/'
+    $GithubRepository = ($remoteUrl -split '[\/:]' | select -last 2) -replace '\.git$','' -join '/'
   } else {
     $GithubRepository = "USERNAME/REPOSITORY-NAME"
   }

diff --git a/scripts/Update-PackageSourceUrl.ps1 b/scripts/Update-PackageSourceUrl.ps1
@@ -71,7 +71,7 @@ if (!$GithubRepository) {
   if ($remoteName) { $remoteUrl = . git remote get-url $remoteName }
 
   if ($remoteUrl) {
-    $GithubRepository = ($remoteUrl -split '\/' | select -last 2) -replace '\.git$','' -join '/'
+    $GithubRepository = ($remoteUrl -split '[\/:]' | select -last 2) -replace '\.git$','' -join '/'
   } else {
     Write-Warning "Unable to get repository and user, setting dummy values..."
     $GithubRepository = "USERNAME/REPOSITORY-NAME"