Skip to content

Commit 5e07d94

Browse files
committed
Work CI-CD
- Fix setting version for build and publish of POSIX targets. ***NO_CI***
1 parent d7b5d49 commit 5e07d94

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

azure-pipelines.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,16 +1243,22 @@ jobs:
12431243

12441244
variables:
12451245
- group: sign-client-credentials
1246+
- name: REVISION
1247+
value: $[counter('POSIX_2_0_0_versioncounter', 0)]
12461248

12471249
steps:
12481250
- checkout: self
12491251

1252+
- template: azure-pipelines-templates/nb-gitversioning.yml
1253+
12501254
- bash: |
12511255
set -euo pipefail
12521256
if [[ "${BUILD_SOURCEBRANCH}" == *"develop"* || "${BUILD_SOURCEBRANCH}" == *"release"* || "${FORCEUPLOAD}" == "true" ]]; then
12531257
echo "##vso[task.setvariable variable=CLOUDSMITH_REPO]nanoframework-images-dev"
1258+
echo "##vso[task.setvariable variable=POSIX_PACKAGE_VERSION]$(NBGV_SimpleVersion)-preview.$(TARGET_BUILD_COUNTER)"
12541259
else
12551260
echo "##vso[task.setvariable variable=CLOUDSMITH_REPO]nanoframework-images"
1261+
echo "##vso[task.setvariable variable=POSIX_PACKAGE_VERSION]$(NBGV_SimpleVersion).$(TARGET_BUILD_COUNTER)"
12561262
fi
12571263
displayName: Set Cloudsmith repo path
12581264
env:
@@ -1286,6 +1292,7 @@ jobs:
12861292
echo "RID=$(POSIX_RID) ARCH=${NANO_ARCH} LIB_EXT=${LIB_EXT}"
12871293
12881294
cmake -S targets/posix -B build/posix -G Ninja \
1295+
-DBUILD_VERSION=$(NBGV_VersionMajor).$(NBGV_VersionMinor).$(NBGV_BuildNumber).$(TARGET_BUILD_COUNTER) \
12891296
-DNANO_POSIX_ARCH=${NANO_ARCH} \
12901297
-DNANO_POSIX_ENABLE_SMOKE=ON \
12911298
${TOOLCHAIN_ARG}
@@ -1337,7 +1344,8 @@ jobs:
13371344
cloudsmith push raw net-nanoframework/$(CLOUDSMITH_REPO) \
13381345
"$(Build.ArtifactStagingDirectory)/runtimes/$(POSIX_RID)/native/nanoFramework.nanoCLR.$(POSIX_LIB_EXT)" \
13391346
--name "nanoCLR_$(POSIX_RID)" \
1340-
--version "$(POSIX_CLR_VERSION)" \
1347+
--version "$(POSIX_PACKAGE_VERSION)" \
1348+
--republish \
13411349
-k "$(CLOUDSMITH_KEY)"
13421350
condition: >-
13431351
and(

0 commit comments

Comments
 (0)