diff --git a/.github/actions/build_cli/action.yml b/.github/actions/build_cli/action.yml index 7c8d4e959..cbf336194 100644 --- a/.github/actions/build_cli/action.yml +++ b/.github/actions/build_cli/action.yml @@ -56,9 +56,10 @@ runs: - name: Build CLI run: | + GIT_TAG=$(git describe --tags --always --dirty --abbrev=0) mkdir build cd build - cmake .. + cmake -DCLI_VERSION:STRING=${GIT_TAG} .. make -j`nproc` cli echo "$(pwd)" >> $GITHUB_PATH export PATH="$PATH:$(pwd)" diff --git a/CHANGELOG.md b/CHANGELOG.md index 53792ede8..8604f550b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Internal +## [1.3.1] - 2022-07-11 + +### Changed +- Update default CoreOS image to latest version (1657199013). + +### Fixed +- Add load balancer path to Azure deployment so that PCR values can be read. +- Show correct version number in `constellation version`. + +### Removed +- Support for Azure `Standard_*_v3` types. + ## [1.3.0] - 2022-07-05 ### Added - Early boot logging for GCP and Azure. [[Docs]](https://constellation-docs.edgeless.systems/6c320851-bdd2-41d5-bf10-e27427398692/#/workflows/troubleshooting?id=cloud-logging) @@ -106,7 +118,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.0.0] - 2022-04-28 Initial release of Constellation. With underlying WireGuard and Kubernetes compliant. -[Unreleased]: https://github.com/edgelesssys/constellation/compare/v1.3.0...HEAD +[Unreleased]: https://github.com/edgelesssys/constellation/compare/v1.3.1...HEAD +[1.3.1]: https://github.com/edgelesssys/constellation/compare/v1.3.0...v1.3.1 [1.3.0]: https://github.com/edgelesssys/constellation/compare/v1.2.0...v1.3.0 [1.2.0]: https://github.com/edgelesssys/constellation/compare/v1.1.0...v1.2.0 [1.1.0]: https://github.com/edgelesssys/constellation/compare/v1.0.0...v1.1.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 46dfa63b1..da415c0b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.11) project(coordinator LANGUAGES C VERSION 0.1.0) +set(CLI_VERSION "v0.1.0" CACHE STRING "Version of CLI binary.") + enable_testing() # @@ -28,7 +30,7 @@ add_custom_target(coordinator ALL # add_custom_target(cli ALL - CGO_ENABLED=0 go build -o ${CMAKE_BINARY_DIR}/constellation -tags=gcp -ldflags "-buildid='' -X github.com/edgelesssys/constellation/internal/constants.VersionInfo=${PROJECT_VERSION}" + CGO_ENABLED=0 go build -o ${CMAKE_BINARY_DIR}/constellation -tags=gcp -ldflags "-buildid='' -X github.com/edgelesssys/constellation/internal/constants.VersionInfo=${CLI_VERSION}" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cli BYPRODUCTS constellation ) diff --git a/docs/release.md b/docs/release.md index 0a5eff04d..c1f12f46b 100644 --- a/docs/release.md +++ b/docs/release.md @@ -9,7 +9,7 @@ This checklist will prepare `v1.3.0` from `v1.2.0`. Adjust your version numbers * Version of the image to build: `1.3.0` 3. Create a new branch to prepare the following things: 1. Review and update changelog with all changes since last release. [GitHub's diff view](https://github.com/edgelesssys/constellation/compare/v1.2.0...main) helps a lot! - 2. Update versions [images.go](../coordinator/kubernetes/k8sapi/resources/images.go) to `v1.3`. Omit patch version so containers pick up patch level updates automatically. + 2. Update versions [images.go](../coordinator/kubernetes/k8sapi/resources/images.go) to `v1.3.0` 3. Merge this branch 4. Create a new tag in `constellation` * `git tag v.1.3.0`