Skip to content

Commit 4dd2707

Browse files
r12fr12f
committed
try fix azure pipeline again.
1 parent ce94fee commit 4dd2707

1 file changed

Lines changed: 34 additions & 34 deletions

File tree

‎justfile‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export BUILD_SIGNING_CLIENT_SECRET := env_var_or_default("BUILD_SIGNING_CLIENT_S
5454
export BUILD_SIGNING_CERT_NAME := env_var_or_default("BUILD_SIGNING_CERT_NAME", "")
5555

5656
# Publish
57-
PUBLISH_DIR := justfile_directory() + "/publish"
57+
PUBLISH_DIR := BUILD_OUTPUT_FOLDER + "/publish"
5858
PUBLISH_PACKAGES_DIR := PUBLISH_DIR + "/packages"
5959
PUBLISH_CHECKSUMS_DIR := PUBLISH_DIR + "/checksums"
6060

@@ -185,20 +185,20 @@ pack-prepare PACKAGE="divoom_cli":
185185
echo "package.tags=divoom;pixoo;pixoo64" >> "{{PUBLISH_DIR}}/{{PACKAGE}}/template-parameters/parameters.txt"
186186

187187
pack-source:
188-
if (Test-Path "{{BUILD_OUTPUT_FOLDER}}/publish/source") { Remove-Item -Path "{{BUILD_OUTPUT_FOLDER}}/publish/source" -Recurse -Force }
189-
New-Item -ItemType Directory -Path "{{BUILD_OUTPUT_FOLDER}}/publish/source" -Force | Out-Null
188+
if (Test-Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/source") { Remove-Item -Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/source" -Recurse -Force }
189+
New-Item -ItemType Directory -Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/source" -Force | Out-Null
190190

191-
Copy-Item -Path "{{justfile_directory()}}/build" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/source" -Recurse
192-
Copy-Item -Path "{{justfile_directory()}}/divoom" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/source" -Recurse
193-
Copy-Item -Path "{{justfile_directory()}}/divoom_cli" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/source" -Recurse
194-
Copy-Item -Path "{{justfile_directory()}}/Cargo.*" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/source" -Recurse
195-
Copy-Item -Path "{{justfile_directory()}}/justfile" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/source" -Recurse
196-
Copy-Item -Path "{{justfile_directory()}}/LICENSE" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/source" -Recurse
197-
Copy-Item -Path "{{justfile_directory()}}/README.md" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/source" -Recurse
191+
Copy-Item -Path "{{justfile_directory()}}/build" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/source" -Recurse
192+
Copy-Item -Path "{{justfile_directory()}}/divoom" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/source" -Recurse
193+
Copy-Item -Path "{{justfile_directory()}}/divoom_cli" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/source" -Recurse
194+
Copy-Item -Path "{{justfile_directory()}}/Cargo.*" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/source" -Recurse
195+
Copy-Item -Path "{{justfile_directory()}}/justfile" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/source" -Recurse
196+
Copy-Item -Path "{{justfile_directory()}}/LICENSE" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/source" -Recurse
197+
Copy-Item -Path "{{justfile_directory()}}/README.md" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/source" -Recurse
198198

199199
if (-not (Test-Path "{{PUBLISH_PACKAGES_DIR}}")) { New-Item -ItemType Directory -Path "{{PUBLISH_PACKAGES_DIR}}" -Force | Out-Null }
200200
if (Test-Path "{{PUBLISH_PACKAGES_DIR}}/divoom.source.{{BUILD_VERSION}}.zip") { Remove-Item -Path "{{PUBLISH_PACKAGES_DIR}}/divoom.source.{{BUILD_VERSION}}.zip" -Recurse -Force }
201-
7z -tzip a "{{PUBLISH_PACKAGES_DIR}}/divoom.source.{{BUILD_VERSION}}.zip" "./{{BUILD_OUTPUT_FOLDER}}/publish/source/*"
201+
7z -tzip a "{{PUBLISH_PACKAGES_DIR}}/divoom.source.{{BUILD_VERSION}}.zip" "./{{BUILD_OUTPUT_FOLDER}}/publish-prepare/source/*"
202202

203203
just gen-checksum "packages.source" "{{PUBLISH_PACKAGES_DIR}}/divoom.source.{{BUILD_VERSION}}.zip";
204204

@@ -251,52 +251,52 @@ pack-binary-zip PACKAGE="divoom_cli":
251251
}
252252

253253
pack-msix PACKAGE="divoom_cli":
254-
if (Test-Path "{{BUILD_OUTPUT_FOLDER}}/publish/msix") { Remove-Item -Path "{{BUILD_OUTPUT_FOLDER}}/publish/msix" -Recurse -Force }
255-
New-Item -ItemType Directory -Path "{{BUILD_OUTPUT_FOLDER}}/publish/msix/bin" -Force | Out-Null
256-
New-Item -ItemType Directory -Path "{{BUILD_OUTPUT_FOLDER}}/publish/msix/assets" -Force | Out-Null
254+
if (Test-Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix") { Remove-Item -Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix" -Recurse -Force }
255+
New-Item -ItemType Directory -Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/bin" -Force | Out-Null
256+
New-Item -ItemType Directory -Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/assets" -Force | Out-Null
257257

258-
Copy-Item -Path "{{justfile_directory()}}/assets/*" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/msix/assets"
259-
Copy-Item -Path "{{justfile_directory()}}/LICENSE" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/msix/bin"
260-
Copy-Item -Path "{{justfile_directory()}}/README.md" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/msix/bin"
261-
Copy-Item -Path "{{PUBLISH_DIR}}/{{PACKAGE}}/bin/*" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/msix/bin"
258+
Copy-Item -Path "{{justfile_directory()}}/assets/*" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/assets"
259+
Copy-Item -Path "{{justfile_directory()}}/LICENSE" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/bin"
260+
Copy-Item -Path "{{justfile_directory()}}/README.md" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/bin"
261+
Copy-Item -Path "{{PUBLISH_DIR}}/{{PACKAGE}}/bin/*" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/bin"
262262

263263
just eval-template "{{justfile_directory()}}/build/package-templates/msix/appxmanifest.xml" \
264-
"{{BUILD_OUTPUT_FOLDER}}/publish/msix/appxmanifest.xml" \
264+
"{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/appxmanifest.xml" \
265265
"{{PUBLISH_DIR}}/{{PACKAGE}}/template-parameters" \
266266
"{{PUBLISH_CHECKSUMS_DIR}}"
267267

268268
just eval-template "{{justfile_directory()}}/build/package-templates/msix/appxmappings.txt" \
269-
"{{BUILD_OUTPUT_FOLDER}}/publish/msix/appxmappings.txt" \
269+
"{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/appxmappings.txt" \
270270
"{{PUBLISH_DIR}}/{{PACKAGE}}/template-parameters" \
271271
"{{PUBLISH_CHECKSUMS_DIR}}"
272272

273-
& "C:/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64/makeappx.exe" pack /m "{{BUILD_OUTPUT_FOLDER}}/publish/msix/appxmanifest.xml" \
274-
/f "{{BUILD_OUTPUT_FOLDER}}/publish/msix/appxmappings.txt" \
275-
/p "{{BUILD_OUTPUT_FOLDER}}/publish/msix/{{replace(PACKAGE, '_', '-')}}.{{BUILD_VERSION}}.{{BUILD_OS}}.{{BUILD_ARCH}}.msix"
273+
& "C:/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64/makeappx.exe" pack /m "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/appxmanifest.xml" \
274+
/f "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/appxmappings.txt" \
275+
/p "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/{{replace(PACKAGE, '_', '-')}}.{{BUILD_VERSION}}.{{BUILD_OS}}.{{BUILD_ARCH}}.msix"
276276

277-
just sign-file "{{BUILD_OUTPUT_FOLDER}}/publish/msix/{{replace(PACKAGE, '_', '-')}}.{{BUILD_VERSION}}.{{BUILD_OS}}.{{BUILD_ARCH}}.msix"
277+
just sign-file "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/{{replace(PACKAGE, '_', '-')}}.{{BUILD_VERSION}}.{{BUILD_OS}}.{{BUILD_ARCH}}.msix"
278278

279279
if (-not (Test-Path "{{PUBLISH_PACKAGES_DIR}}")) { New-Item -ItemType Directory -Path "{{PUBLISH_PACKAGES_DIR}}" -Force | Out-Null }
280-
Copy-Item -Path "{{BUILD_OUTPUT_FOLDER}}/publish/msix/*.msix" -Destination "{{PUBLISH_PACKAGES_DIR}}" -Force
280+
Copy-Item -Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/msix/*.msix" -Destination "{{PUBLISH_PACKAGES_DIR}}" -Force
281281

282282
pack-nuget PACKAGE="divoom_cli":
283-
if (Test-Path "{{BUILD_OUTPUT_FOLDER}}/publish/nuget") { Remove-Item -Path "{{BUILD_OUTPUT_FOLDER}}/publish/nuget" -Recurse -Force }
284-
New-Item -ItemType Directory -Path "{{BUILD_OUTPUT_FOLDER}}/publish/nuget" -Force | Out-Null
285-
New-Item -ItemType Directory -Path "{{BUILD_OUTPUT_FOLDER}}/publish/nuget/content" -Force | Out-Null
283+
if (Test-Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/nuget") { Remove-Item -Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/nuget" -Recurse -Force }
284+
New-Item -ItemType Directory -Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/nuget" -Force | Out-Null
285+
New-Item -ItemType Directory -Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/nuget/content" -Force | Out-Null
286286

287-
Copy-Item -Path "{{justfile_directory()}}/LICENSE" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/nuget/content"
288-
Copy-Item -Path "{{justfile_directory()}}/README.md" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/nuget/content"
289-
Copy-Item -Path "{{PUBLISH_DIR}}/{{PACKAGE}}/bin/*" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish/nuget/content"
287+
Copy-Item -Path "{{justfile_directory()}}/LICENSE" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/nuget/content"
288+
Copy-Item -Path "{{justfile_directory()}}/README.md" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/nuget/content"
289+
Copy-Item -Path "{{PUBLISH_DIR}}/{{PACKAGE}}/bin/*" -Destination "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/nuget/content"
290290

291291
just eval-template "{{justfile_directory()}}/build/package-templates/nuget/nupkg.csproj" \
292-
"{{BUILD_OUTPUT_FOLDER}}/publish/nuget/nupkg.csproj" \
292+
"{{BUILD_OUTPUT_FOLDER}}/publish-prepare/nuget/nupkg.csproj" \
293293
"{{PUBLISH_DIR}}/{{PACKAGE}}/template-parameters" \
294294
"{{PUBLISH_CHECKSUMS_DIR}}"
295295

296-
dotnet pack "{{BUILD_OUTPUT_FOLDER}}/publish/nuget/nupkg.csproj" -o "{{BUILD_OUTPUT_FOLDER}}/publish/nuget/output"
296+
dotnet pack "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/nuget/nupkg.csproj" -o "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/nuget/output"
297297

298298
if (-not (Test-Path "{{PUBLISH_PACKAGES_DIR}}")) { New-Item -ItemType Directory -Path "{{PUBLISH_PACKAGES_DIR}}" -Force | Out-Null }
299-
Copy-Item -Path "{{BUILD_OUTPUT_FOLDER}}/publish/nuget/output/*.nupkg" -Destination "{{PUBLISH_PACKAGES_DIR}}" -Force
299+
Copy-Item -Path "{{BUILD_OUTPUT_FOLDER}}/publish-prepare/nuget/output/*.nupkg" -Destination "{{PUBLISH_PACKAGES_DIR}}" -Force
300300

301301

302302
#

0 commit comments

Comments
 (0)