From afae39f3cfea43e29e7c5a3328797bfd82d4a2fe Mon Sep 17 00:00:00 2001 From: rturrado Date: Wed, 16 Oct 2024 12:59:50 +0200 Subject: [PATCH 1/4] Update libqasm version text strings. --- docs/dev-guide/cpp.md | 2 +- docs/user-guide/cpp.md | 4 ++-- emscripten/test_libqasm.ts | 2 +- include/libqasm/versioning.hpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/dev-guide/cpp.md b/docs/dev-guide/cpp.md index 2493f060..0a811efd 100644 --- a/docs/dev-guide/cpp.md +++ b/docs/dev-guide/cpp.md @@ -6,7 +6,7 @@ The following line will also build and cache the `libqasm` Conan package. ```shell conan profile detect -conan create --version 0.6.7 . -pr:a=tests-debug -b missing +conan create --version 0.6.8 . -pr:a=tests-debug -b missing ``` You can test the C++ binaries: diff --git a/docs/user-guide/cpp.md b/docs/user-guide/cpp.md index a1522762..f1ef5c39 100644 --- a/docs/user-guide/cpp.md +++ b/docs/user-guide/cpp.md @@ -2,9 +2,9 @@ libQASM can be requested as a Conan package from a `conanfile.py`. ``` def build_requirements(self): - self.tool_requires("libqasm/0.6.7") + self.tool_requires("libqasm/0.6.8") def requirements(self): - self.requires("libqasm/0.6.7") + self.requires("libqasm/0.6.8") ``` And then linked against from a `CMakeLists.txt`: diff --git a/emscripten/test_libqasm.ts b/emscripten/test_libqasm.ts index 5aa0f92b..2a19b40d 100644 --- a/emscripten/test_libqasm.ts +++ b/emscripten/test_libqasm.ts @@ -8,7 +8,7 @@ wrapper().then(function(result: any) { try { let output = cqasm.get_version() - let expected_output = "0.6.7" + let expected_output = "0.6.8" console.log("\nThe version of libqasm compiled with emscripten is:", output); if (output !== expected_output) { console.log("\tExpected output:", expected_output) diff --git a/include/libqasm/versioning.hpp b/include/libqasm/versioning.hpp index daace66c..57b84f0a 100644 --- a/include/libqasm/versioning.hpp +++ b/include/libqasm/versioning.hpp @@ -2,7 +2,7 @@ namespace cqasm { -static const char* version{ "0.6.7" }; +static const char* version{ "0.6.8" }; static const char* release_year{ "2024" }; [[nodiscard]] [[maybe_unused]] static const char* get_version() { From 344f76a8d9f7a962f334438d2f816a03695d68b7 Mon Sep 17 00:00:00 2001 From: rturrado Date: Wed, 16 Oct 2024 13:26:43 +0200 Subject: [PATCH 2/4] Update CHANGELOG.md. --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d96f7200..5e58f741 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [ 0.6.8 ] - [ 2024-10-16 ] + +### Added +- Gate modifiers: `inv`, `pow`, and `ctrl`. +- C++ linters GitHub Actions job (just running clang-format at the moment). + +### Changed +- Fix bug: empty lists are written out to JSON as `"[]"` instead of `[]`. +- More descriptive and consistent (snake case) file names. +- Minor fixes and tweaks to documentation. + +### Removed + + ## [ 0.6.7 ] - [ 2024-05-30 ] ### Added From 9e66f8d4c663711c296780b939cf38135c51115f Mon Sep 17 00:00:00 2001 From: rturrado Date: Wed, 16 Oct 2024 16:14:17 +0200 Subject: [PATCH 3/4] Update CHANGELOG.md. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e58f741..530261be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Fix bug: empty lists are written out to JSON as `"[]"` instead of `[]`. +- Fix bug: CRk and CZ parameter types were interchanged in the instruction set. - More descriptive and consistent (snake case) file names. - Minor fixes and tweaks to documentation. From 9e396454cf25d058e48ea90a39f23f9cfb2399a1 Mon Sep 17 00:00:00 2001 From: rturrado Date: Wed, 16 Oct 2024 16:15:12 +0200 Subject: [PATCH 4/4] Run cpp-linux-arm64 job only on master. --- .github/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c216b2f0..c8eec041 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -59,6 +59,8 @@ jobs: needs: cpp-linters runs-on: [self-hosted, ARM64, Linux] container: python:3.11 + # Run only on master (until we have a GitHub-hosted runner for Linux/ARM64) + if: github.ref == 'refs/heads/master' strategy: fail-fast: false matrix: