Skip to content

Commit

Permalink
Merge pull request #212 from Nitrokey/release-v1.3.0
Browse files Browse the repository at this point in the history
Release v1.3.0
  • Loading branch information
robin-nitrokey authored Mar 31, 2023
2 parents ad0c374 + aac33ae commit 2e035ca
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ Cargo.lock
!Cargo.lock
/license.txt
/commands.bd
/manifest.json
5 changes: 3 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"'
Expand All @@ -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:
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ members = [
resolver = "2"

[workspace.package]
version = "1.3.0-alpha.20230320"
version = "1.3.0"

[patch.crates-io]
# forked
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 9 additions & 0 deletions utils/manifest.template.json
Original file line number Diff line number Diff line change
@@ -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"
}
}

0 comments on commit 2e035ca

Please sign in to comment.