فهرست منبع

setup calling pwsh and fixing ps1 script

DerSkythe 2 سال پیش
والد
کامیت
22ccbee7a1
3فایلهای تغییر یافته به همراه34 افزوده شده و 21 حذف شده
  1. 13 13
      .github/check-version.ps1
  2. 13 6
      .github/workflows/version-check.yml
  3. 8 2
      .vscode/settings.json

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

@@ -22,10 +22,10 @@ function CleanInput
 ################################################################################################################################
 
 $Output = @{
-    ReleaseVersion = ''
-    CurrentTag = ''
-    RemoteTagInfo = ''
-    ReleaseType = ''
+    RELEASE_VERSION = ''
+    CURRENT_TAG = ''
+    REMOTE_TAG_INFO = ''
+    RELEASE_TYPE = ''
 }
 
 $Release = @(`
@@ -61,11 +61,11 @@ Write-Host "FirmwareVersionNumber: $FirmwareVersionNumber, Delta: $Delta"
 $NewVersionFw = $false
 Write-Host ('Latest firmware {0}' -f $FirmwareVersionNumber)
 
-$Output.RemoteTagInfo = Write-Host ('[{0}]({1}/releases/tag/{2})' `
+$Output.REMOTE_TAG_INFO = Write-Host ('[{0}]({1}/releases/tag/{2})' `
         -f $LatestFirmware, $RepoUnleashed, $LatestFirmware)
 if (($FirmwareVersionNumber -gt $StoredFirmwareVersionNumber) -and ( $Delta -gt [TimeSpan]::FromMinutes(10)))
 {
-    $Output.RemoteTagInfo = $LatestFirmware
+    $Output.REMOTE_TAG_INFO = $LatestFirmware
     $NewVersionFw = $true
 }
 elseif ($FirmwareVersionNumber -lt $StoredFirmwareVersionNumber)
@@ -97,8 +97,8 @@ if (($CurrentVersion -lt $ParsedRepoVersion) -and ( $Delta -gt [TimeSpan]::FromM
 {
     $Tag = ('{0}.{1}.{2}' -f $ParsedRepoVersion.Major, $ParsedRepoVersion.Minor, $ParsedRepoVersion.Build)
 
-    $Output.ReleaseVersion = $Tag
-    $Output.ReleaseType = 2
+    $Output.RELEASE_VERSION = $Tag
+    $Output.RELEASE_TYPE = 2
 
     Write-Host ('::warning title=New release!::Release {0}' -f $Tag)
 }
@@ -106,8 +106,8 @@ elseif ( $NewVersionFw )
 {
     $Tag = ('{0}.{1}.{2}' -f $CurrentVersion.Major, $CurrentVersion.Minor, ($CurrentVersion.Build + 1))
 
-    $Output.ReleaseVersion = $Tag
-    $Output.ReleaseType = 1
+    $Output.RELEASE_VERSION = $Tag
+    $Output.RELEASE_TYPE = 1
 
     Write-Host ('::warning title=Firmware was changed!::New version is {0}, need to create release {1}' -f $LatestFirmware, $Tag)
 }
@@ -116,8 +116,8 @@ elseif ( ($Delta -gt [TimeSpan]::FromMinutes(10)) -and ($CurrentVersion -gt $Par
     Write-Host ('::warning title=Invalid version!::Version in settings: {0}, but repo version is {1}. Going to change variable' `
         -f $CurrentVersion, $ParsedRepoVersion)
 
-    $Output.ReleaseVersion = $ParsedRepoVersion
-    $Output.ReleaseType = 3
+    $Output.RELEASE_VERSION = $ParsedRepoVersion
+    $Output.RELEASE_TYPE = 3
 }
 else
 {
@@ -125,7 +125,7 @@ else
     Write-Host 'No new versions, sorry'
 }
 
-$Output.CurrentTag = $LatestTag
+$Output.CURRENT_TAG = $LatestTag
 
 if($ForGithubActions) {
     $Plain = New-Object -TypeName "System.Text.StringBuilder";

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

@@ -20,6 +20,8 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REPO_UNLEASHED: ${{ vars.REPO_UNLEASHED }}
+      CURRENT_TAG: ${{ vars.FIRMWARE_VERSION }}
+      REMOTE_TAG_INFO: ''
       RELEASE_VERSION: ${{ vars.RELEASE_VERSION }}
       FIRMWARE_VERSION: ${{ vars.FIRMWARE_VERSION }}
       REPO_SELF: ${{ vars.REPO_SELF }}
@@ -29,7 +31,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: "${{ env.REPO_SELF }}"
-          path: "${{ env.CHECKOUT_DIR }}"
           clean: "true"
           submodules: "true"
           token: ${{ secrets.FLIPPER_TOKEN }}
@@ -38,15 +39,21 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          $Cmd = "$env:GITHUB_ACTION_PATH/.github/check-version.ps1"
-          $Params = @("${{ env.FIRMWARE_VERSION }}" "${{ env.RELEASE_VERSION }}" "${{ env.REPO_SELF }}" "${{ env.REPO_UNLEASHED }}");
-          & $cmd $params
-          #& $Cmd $Params | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+          ./.github/check-version.ps1 '${{ env.FIRMWARE_VERSION }}' '${{ env.RELEASE_VERSION }}' '${{ env.REPO_SELF }}' '${{ env.REPO_UNLEASHED }}' | %{ Write-Output($_) >> $Env:GITHUB_ENV }
+          #Write-Output("CURRENT_TAG=$($Output.CurrentTag)") >> $env:GITHUB_ENV
+          #| Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+#          New-Alias -Name sc -Value ".\.github/check-version.ps1"
+#          $Params = @("${{ env.FIRMWARE_VERSION }}", "${{ env.RELEASE_VERSION }}", "${{ env.REPO_SELF }}", "${{ env.REPO_UNLEASHED }}")
+#          sc $Params
+#          #& $Cmd $Params | 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
+#        Write-Output("RELEASE_TYPE=$($Output.ReleaseType)") | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+      - name: Print env values
+        run: env
+          
       - name: Update Firmware variable and create UPDATE release if necessary
         if: ${{ success() && env.RELEASE_TYPE == 1 }}
         env:

+ 8 - 2
.vscode/settings.json

@@ -1,5 +1,11 @@
 {
     "githubPullRequests.ignoredPullRequestBranches": [
         "master"
-    ]
-}
+    ],
+    "workbench.colorCustomizations": {
+        "list.errorForeground": "#00AA00",
+        "list.warningForeground": "#00d9ff",
+        "gitDecoration.modifiedResourceForeground": "#00ffb3",
+        "gitDecoration.untrackedResourceForeground": "#f7aeae"
+    }
+}