ci: remove nrf-develop-artifacts; add version string to nrf builds

Nitrokey · Nov 21, 2022 · 5a7fef4 · 5a7fef4
1 parent 65dffbd
commit 5a7fef4
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -78,22 +78,21 @@ build-nrf52-nk3mini:
     - apt-get install -y python3 python3-toml
     - rustup target add thumbv7em-none-eabihf
     - rustup +nightly-2022-11-13 target add thumbv7em-none-eabihf
+    - export VERSION=`git describe --always`
     - mkdir -p artifacts
     - make -C runners/embedded build-nk3am.bl FEATURES=provisioner
-    - cp runners/embedded/artifacts/*.bin artifacts/provisioner-nk3am-nrf52.bin
-    - cp runners/embedded/artifacts/*.ihex artifacts/provisioner-nk3am-nrf52.ihex
+    - cp runners/embedded/artifacts/*.bin artifacts/provisioner-nk3am-nrf52-$VERSION.bin
+    - cp runners/embedded/artifacts/*.ihex artifacts/provisioner-nk3am-nrf52-$VERSION.ihex
     - make -C runners/embedded clean-nk3am.bl FEATURES=provisioner
     - make -C runners/embedded build-nk3am.bl FEATURES=alpha
-    - cp runners/embedded/artifacts/*.bin artifacts/alpha-nk3am-nrf52.bin
-    - cp runners/embedded/artifacts/*.ihex artifacts/alpha-nk3am-nrf52.ihex
+    - cp runners/embedded/artifacts/*.bin artifacts/alpha-nk3am-nrf52-$VERSION.bin
+    - cp runners/embedded/artifacts/*.ihex artifacts/alpha-nk3am-nrf52-$VERSION.ihex
     - make -C runners/embedded clean-nk3am.bl FEATURES=alpha
     - make -C runners/embedded build-nk3am.bl FEATURES=develop
-    - cp runners/embedded/artifacts/*.bin artifacts/develop-nk3am-nrf52.bin
-    - cp runners/embedded/artifacts/*.ihex artifacts/develop-nk3am-nrf52.ihex
     - make -C runners/embedded clean-nk3am.bl FEATURES=develop
     - make -C runners/embedded build-nk3am.bl FEATURES=release
-    - cp runners/embedded/artifacts/*.bin artifacts/firmware-nk3am-nrf52.bin
-    - cp runners/embedded/artifacts/*.ihex artifacts/firmware-nk3am-nrf52.ihex
+    - cp runners/embedded/artifacts/*.bin artifacts/firmware-nk3am-nrf52-$VERSION.bin
+    - cp runners/embedded/artifacts/*.ihex artifacts/firmware-nk3am-nrf52-$VERSION.ihex
   after_script:
     - wget $icon_server/checkmark/$CI_COMMIT_REF_NAME/$CI_COMMIT_SHA/$CI_JOB_NAME/$CI_JOB_STATUS/${CI_JOB_URL#*/*/*/}
   artifacts: