Skip to content

Commit 979222d

Browse files
committed
chore(jetify): fix build path
1 parent 92508d1 commit 979222d

File tree

1 file changed

+32
-24
lines changed

1 file changed

+32
-24
lines changed

.github/workflows/jetify.yml

+32-24
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: jetify
22

33
on:
4+
push:
45
workflow_dispatch:
56
inputs:
67
version:
@@ -60,7 +61,7 @@ jobs:
6061
} else {
6162
"publish-test"
6263
}
63-
64+
6465
if (-Not $IsMasterBranch) {
6566
$DryRun = $true # force dry run when not on master branch
6667
}
@@ -134,7 +135,7 @@ jobs:
134135
run: |
135136
Enter-VsDevShell ${{matrix.arch}}
136137
$GitCommit = '${{ needs.preflight.outputs.detours-git-commit }}'
137-
.\detours.ps1 -GitCommit $GitCommit
138+
.\jetify\detours.ps1 -GitCommit $GitCommit
138139
139140
- name: Save Detours Cache (${{matrix.arch}})
140141
if: steps.cache-detours.outputs.cache-hit != 'true'
@@ -145,6 +146,7 @@ jobs:
145146

146147
- name: Build Jetify (${{matrix.arch}})
147148
shell: pwsh
149+
working-directory: jetify
148150
run: |
149151
$Arch = "${{matrix.arch}}"
150152
$BuildDir = "build-$Arch"
@@ -156,13 +158,14 @@ jobs:
156158
@('Jetify.dll') | % {
157159
Copy-Item "$BuildDir/Release/$_" "dependencies/Jetify/$Arch"
158160
}
161+
mkdir package
159162
Compress-Archive "dependencies\Jetify\$Arch\*" ".\package\Jetify-$PackageVersion-$Arch.zip" -CompressionLevel Optimal
160163
161164
- name: Upload Jetify (${{matrix.arch}})
162165
uses: actions/upload-artifact@v4
163166
with:
164167
name: Jetify-${{matrix.arch}}
165-
path: package/*.zip
168+
path: jetify/package/*.zip
166169

167170
package:
168171
name: Package Jetify
@@ -225,16 +228,21 @@ jobs:
225228
'-kvc', '${{ secrets.CODE_SIGNING_CERTIFICATE_NAME }}',
226229
'-tr', '${{ vars.CODE_SIGNING_TIMESTAMP_SERVER }}',
227230
'-v')
228-
Get-ChildItem "$UnpackedDir\lib" -Include @("*.dll") -Recurse | ForEach-Object {
231+
Get-ChildItem $UnpackedDir -Recurse
232+
Get-ChildItem "$UnpackedDir" -Include @("*.dll") -Recurse | ForEach-Object {
229233
AzureSignTool @Params $_.FullName
230234
}
231235
Remove-Item $PackedFile -ErrorAction SilentlyContinue | Out-Null
232236
Compress-Archive -Path "$UnpackedDir\*" -Destination $PackedFile -CompressionLevel Optimal
233-
237+
234238
- name: Code sign nuget package
235239
if: ${{ fromJSON(needs.preflight.outputs.sign-nuget) == true }}
236240
shell: pwsh
241+
working-directory: jetify
237242
run: |
243+
ls
244+
echo "------------------------"
245+
ls package
238246
$NugetPackage = (Get-Item ".\package\*.nupkg" | Select-Object -First 1) | Resolve-Path -Relative
239247
$Params = @('sign', $NugetPackage,
240248
'-kvt', '${{ secrets.AZURE_TENANT_ID }}',
@@ -245,7 +253,7 @@ jobs:
245253
'-tr', '${{ vars.CODE_SIGNING_TIMESTAMP_SERVER }}',
246254
'-v')
247255
& NuGetKeyVaultSignTool @Params
248-
256+
249257
- name: Upload nuget package
250258
uses: actions/upload-artifact@v4
251259
with:
@@ -266,21 +274,21 @@ jobs:
266274
name: Jetify-nupkg
267275
path: package
268276

269-
- name: Publish to nuget.org
270-
shell: pwsh
271-
run: |
272-
$DryRun = [System.Boolean]::Parse('${{ needs.preflight.outputs.dry-run }}')
273-
$NugetPackage = (Get-Item ./package/*.nupkg) | Resolve-Path -Relative
274-
275-
$PushArgs = @(
276-
'nuget', 'push', "$NugetPackage",
277-
'--api-key', '${{ secrets.NUGET_API_KEY }}',
278-
'--source', 'https://api.nuget.org/v3/index.json',
279-
'--skip-duplicate', '--no-symbols'
280-
)
281-
Write-Host "dotnet $($PushArgs -Join ' ')"
282-
if ($DryRun) {
283-
Write-Host "Dry Run: skipping nuget.org publishing!"
284-
} else {
285-
& 'dotnet' $PushArgs
286-
}
277+
# - name: Publish to nuget.org
278+
# shell: pwsh
279+
# run: |
280+
# $DryRun = [System.Boolean]::Parse('${{ needs.preflight.outputs.dry-run }}')
281+
# $NugetPackage = (Get-Item ./package/*.nupkg) | Resolve-Path -Relative
282+
283+
# $PushArgs = @(
284+
# 'nuget', 'push', "$NugetPackage",
285+
# '--api-key', '${{ secrets.NUGET_API_KEY }}',
286+
# '--source', 'https://api.nuget.org/v3/index.json',
287+
# '--skip-duplicate', '--no-symbols'
288+
# )
289+
# Write-Host "dotnet $($PushArgs -Join ' ')"
290+
# if ($DryRun) {
291+
# Write-Host "Dry Run: skipping nuget.org publishing!"
292+
# } else {
293+
# & 'dotnet' $PushArgs
294+
# }

0 commit comments

Comments
 (0)