diff --git a/.gitignore b/.gitignore index 1622f61e..82dfc945 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ Cargo.lock !Cargo.lock /license.txt /commands.bd +/manifest.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7379235..2576cd51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ variables: IMAGE_NAME: nitrokey3 COMMON_UPDATE_DOCKER: "true" -build-license-txt: +build-metadata: image: registry.git.nitrokey.com/nitrokey/nitrokey-3-firmware/nitrokey3:latest rules: - if: '$CI_PIPELINE_SOURCE == "push"' @@ -28,9 +28,10 @@ build-license-txt: stage: build script: - make license.txt + - make manifest.json after_script: - mkdir -p artifacts - - cp license.txt artifacts + - cp license.txt manifest.json artifacts - wget $icon_server/checkmark/$CI_COMMIT_REF_NAME/$CI_COMMIT_SHA/$CI_JOB_NAME/$CI_JOB_STATUS/${CI_JOB_URL#*/*/*/} artifacts: paths: diff --git a/CHANGELOG.md b/CHANGELOG.md index bdf4688a..61a166c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,12 @@ -# v1.3.0-RC1 (2023-03-13) +# v1.3.0 (2023-03-27) + +This release introduces the Secrets App with OTP functionality and contains some bugfixes. + +**Warning:** On Nitrokey 3 Mini devices, this release causes a migration of the internal filesystem. See the [Release Notes][v1.3.0] on GitHub for more information. + +[v1.3.0]: https://github.com/Nitrokey/nitrokey-3-firmware/releases/tag/v1.3.0 + +## v1.3.0-RC1 (2023-03-13) ### Features diff --git a/Cargo.lock b/Cargo.lock index af0e80fd..4484aba5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "apps" -version = "1.3.0-alpha.20230320" +version = "1.3.0" dependencies = [ "admin-app", "apdu-dispatch", @@ -942,7 +942,7 @@ dependencies = [ [[package]] name = "embedded-runner-lib" -version = "1.3.0-alpha.20230320" +version = "1.3.0" dependencies = [ "alloc-cortex-m", "apdu-dispatch", @@ -3136,7 +3136,7 @@ dependencies = [ [[package]] name = "usbip-runner" -version = "1.3.0-alpha.20230320" +version = "1.3.0" dependencies = [ "apps", "cfg-if", @@ -3154,7 +3154,7 @@ dependencies = [ [[package]] name = "utils" -version = "1.3.0-alpha.20230320" +version = "1.3.0" dependencies = [ "delog", "littlefs2", diff --git a/Cargo.toml b/Cargo.toml index fb292dd1..b64646fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ members = [ resolver = "2" [workspace.package] -version = "1.3.0-alpha.20230320" +version = "1.3.0" [patch.crates-io] # forked diff --git a/Makefile b/Makefile index a4e1d70a..bc7cf2ad 100644 --- a/Makefile +++ b/Makefile @@ -15,3 +15,6 @@ commands.bd: runners/embedded/Cargo.toml \ runners/embedded/profiles/lpc55.toml \ > $@ + +manifest.json: + sed "s/@VERSION@/`git describe --always`/g" utils/manifest.template.json > manifest.json diff --git a/utils/manifest.template.json b/utils/manifest.template.json new file mode 100644 index 00000000..7e4c7cfc --- /dev/null +++ b/utils/manifest.template.json @@ -0,0 +1,9 @@ +{ + "device": "Nitrokey 3", + "version": "@VERSION@", + "pynitrokey": "v0.4.35", + "images": { + "lpc55": "firmware-nk3xn-lpc55-@VERSION@.sb2", + "nrf52": "firmware-nk3am-nrf52-@VERSION@.zip" + } +}