Просмотр исходного кода

feat: moved to pwsh scripts from yaml and fix invalid new version number

DerSkythe 2 лет назад
Родитель
Сommit
56f8c738ff
2 измененных файлов с 20 добавлено и 7 удалено
  1. 13 1
      .github/check-version.ps1
  2. 7 6
      .github/workflows/version-check.yml

+ 13 - 1
.github/check-version.ps1

@@ -7,6 +7,7 @@ $ErrorActionPreference = "Stop"        #
 [string]$ReleaseVersion = $args[1]
 [string]$RepoSelf = $args[2]
 [string]$RepoUnleashed = $args[3]
+[bool]$ForGithubActions = $true
 
 ################################################################################################################################
 function CleanInput
@@ -125,4 +126,15 @@ else
 }
 
 $Output.CurrentTag = $LatestTag
-$Output
+
+if($ForGithubActions) {
+    $Plain = New-Object -TypeName "System.Text.StringBuilder";
+    $Output.GetEnumerator() | ForEach-Object {
+        [void]$Plain.Append($_.Key)
+        [void]$Plain.Append('=')
+        [void]$Plain.AppendLine($_.Value)
+    }
+    Write-Output $Plain.ToString()
+} else {
+    $Output
+}

+ 7 - 6
.github/workflows/version-check.yml

@@ -38,12 +38,13 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          $Output = ('& $env:GITHUB_ACTION_PATH/.github/check-version.ps1')
-          Write-Output("RELEASE_VERSION=$($Output.ReleaseVersion)") >> $env:GITHUB_ENV
-          Write-Output("CURRENT_TAG=$($Output.CurrentTag)") >> $env:GITHUB_ENV
-          Write-Output("REMOTE_TAG_INFO=$($Output.RemoteTagInfo)") >> $env:GITHUB_ENV
-          Write-Output("RELEASE_TYPE=$($Output.ReleaseType)") >> $env:GITHUB_ENV
-
+          '& $env:GITHUB_ACTION_PATH/.github/check-version.ps1 "${{ env.FIRMWARE_VERSION }}" "${{ env.RELEASE_VERSION }}" "${{ env.REPO_SELF }}" "${{ env.REPO_UNLEASHED }}"' `
+            | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+#          $Output = ('& $env:GITHUB_ACTION_PATH/.github/check-version.ps1 "${{ env.FIRMWARE_VERSION }}" "${{ env.RELEASE_VERSION }}" "${{ env.REPO_SELF }}" "${{ env.REPO_UNLEASHED }}"')
+#          Write-Output("RELEASE_VERSION=$($Output.ReleaseVersion)") | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+#          Write-Output("CURRENT_TAG=$($Output.CurrentTag)") | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+#          Write-Output("REMOTE_TAG_INFO=$($Output.RemoteTagInfo)") | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+#          Write-Output("RELEASE_TYPE=$($Output.ReleaseType)") | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
       - name: Update Firmware variable and create UPDATE release if necessary
         if: ${{ success() && env.RELEASE_TYPE == 1 }}
         env: