diff --git a/.github/workflows/jetify.yml b/.github/workflows/jetify.yml index 948e036dc..1eec95092 100644 --- a/.github/workflows/jetify.yml +++ b/.github/workflows/jetify.yml @@ -1,6 +1,7 @@ name: jetify on: + push: workflow_dispatch: inputs: version: @@ -60,7 +61,7 @@ jobs: } else { "publish-test" } - + if (-Not $IsMasterBranch) { $DryRun = $true # force dry run when not on master branch } @@ -134,7 +135,7 @@ jobs: run: | Enter-VsDevShell ${{matrix.arch}} $GitCommit = '${{ needs.preflight.outputs.detours-git-commit }}' - .\detours.ps1 -GitCommit $GitCommit + .\jetify\detours.ps1 -GitCommit $GitCommit - name: Save Detours Cache (${{matrix.arch}}) if: steps.cache-detours.outputs.cache-hit != 'true' @@ -145,6 +146,7 @@ jobs: - name: Build Jetify (${{matrix.arch}}) shell: pwsh + working-directory: jetify run: | $Arch = "${{matrix.arch}}" $BuildDir = "build-$Arch" @@ -156,13 +158,14 @@ jobs: @('Jetify.dll') | % { Copy-Item "$BuildDir/Release/$_" "dependencies/Jetify/$Arch" } + mkdir package Compress-Archive "dependencies\Jetify\$Arch\*" ".\package\Jetify-$PackageVersion-$Arch.zip" -CompressionLevel Optimal - name: Upload Jetify (${{matrix.arch}}) uses: actions/upload-artifact@v4 with: name: Jetify-${{matrix.arch}} - path: package/*.zip + path: jetify/package/*.zip package: name: Package Jetify @@ -225,16 +228,21 @@ jobs: '-kvc', '${{ secrets.CODE_SIGNING_CERTIFICATE_NAME }}', '-tr', '${{ vars.CODE_SIGNING_TIMESTAMP_SERVER }}', '-v') - Get-ChildItem "$UnpackedDir\lib" -Include @("*.dll") -Recurse | ForEach-Object { + Get-ChildItem $UnpackedDir -Recurse + Get-ChildItem "$UnpackedDir" -Include @("*.dll") -Recurse | ForEach-Object { AzureSignTool @Params $_.FullName } Remove-Item $PackedFile -ErrorAction SilentlyContinue | Out-Null Compress-Archive -Path "$UnpackedDir\*" -Destination $PackedFile -CompressionLevel Optimal - + - name: Code sign nuget package if: ${{ fromJSON(needs.preflight.outputs.sign-nuget) == true }} shell: pwsh + working-directory: jetify run: | + ls + echo "------------------------" + ls package $NugetPackage = (Get-Item ".\package\*.nupkg" | Select-Object -First 1) | Resolve-Path -Relative $Params = @('sign', $NugetPackage, '-kvt', '${{ secrets.AZURE_TENANT_ID }}', @@ -245,7 +253,7 @@ jobs: '-tr', '${{ vars.CODE_SIGNING_TIMESTAMP_SERVER }}', '-v') & NuGetKeyVaultSignTool @Params - + - name: Upload nuget package uses: actions/upload-artifact@v4 with: @@ -266,21 +274,21 @@ jobs: name: Jetify-nupkg path: package - - name: Publish to nuget.org - shell: pwsh - run: | - $DryRun = [System.Boolean]::Parse('${{ needs.preflight.outputs.dry-run }}') - $NugetPackage = (Get-Item ./package/*.nupkg) | Resolve-Path -Relative - - $PushArgs = @( - 'nuget', 'push', "$NugetPackage", - '--api-key', '${{ secrets.NUGET_API_KEY }}', - '--source', 'https://api.nuget.org/v3/index.json', - '--skip-duplicate', '--no-symbols' - ) - Write-Host "dotnet $($PushArgs -Join ' ')" - if ($DryRun) { - Write-Host "Dry Run: skipping nuget.org publishing!" - } else { - & 'dotnet' $PushArgs - } + # - name: Publish to nuget.org + # shell: pwsh + # run: | + # $DryRun = [System.Boolean]::Parse('${{ needs.preflight.outputs.dry-run }}') + # $NugetPackage = (Get-Item ./package/*.nupkg) | Resolve-Path -Relative + + # $PushArgs = @( + # 'nuget', 'push', "$NugetPackage", + # '--api-key', '${{ secrets.NUGET_API_KEY }}', + # '--source', 'https://api.nuget.org/v3/index.json', + # '--skip-duplicate', '--no-symbols' + # ) + # Write-Host "dotnet $($PushArgs -Join ' ')" + # if ($DryRun) { + # Write-Host "Dry Run: skipping nuget.org publishing!" + # } else { + # & 'dotnet' $PushArgs + # }