Skip to content

Commit

Permalink
Merge branch 'main' into python-impl
Browse files Browse the repository at this point in the history
  • Loading branch information
elchupanebrej committed Dec 31, 2023
2 parents 6a26520 + 2677b50 commit 0cf353b
Show file tree
Hide file tree
Showing 222 changed files with 2,374 additions and 1,310 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release-cpan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: cucumber/action-publish-cpan@v1.0.0
- uses: actions/checkout@v4
- uses: cucumber/action-publish-cpan@v1.0.1
with:
cpan-user: ${{ secrets.CPAN_USER }}
cpan-password: ${{ secrets.CPAN_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-github.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: cucumber/action-create-github-release@v1.1.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/release-mvn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest
environment: Release
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
runs-on: ubuntu-latest
environment: Release
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '20'
cache: 'npm'
cache-dependency-path: javascript/package-lock.json
- run: npm install-test
working-directory: javascript
- uses: cucumber/action-publish-npm@v1.1.0
- uses: cucumber/action-publish-npm@v1.1.1
with:
npm-token: ${{ secrets.NPM_TOKEN }}
working-directory: javascript
4 changes: 2 additions & 2 deletions .github/workflows/release-nuget.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
runs-on: ubuntu-latest
environment: Release
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
- uses: cucumber/action-publish-nuget@v1.0.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-php.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: '0'
- uses: cucumber/action-publish-subrepo@v1.1.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-rubygem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-latest
environment: Release
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0.2'
ruby-version: '3.2'
bundler-cache: true
- uses: cucumber/action-publish-rubygem@v1.0.0
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-codegen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: "npm"
Expand Down
29 changes: 15 additions & 14 deletions .github/workflows/test-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,23 @@ on:

jobs:
test-cpp:
runs-on: ubuntu-latest

strategy:
matrix:
os:
- ubuntu-20.04
- ubuntu-22.04
# - windows-2019
# - windows-2022
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3

- name: install cmake and libraries
- uses: actions/checkout@v4
- name: install dependencies
working-directory: cpp
run: |
sudo apt-get update
sudo apt-get install ninja-build cmake
sudo apt-get install nlohmann-json3-dev
ninja --version
cmake --version
gcc --version
cmake -P cmake/cmade install
- name: configure and build
run: |
cmake -S . -B build
cmake --build build
working-directory: cpp
run: |
cmake -P cmake/cmate configure
cmake -P cmake/cmate build
4 changes: 2 additions & 2 deletions .github/workflows/test-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '5.0.x'

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ jobs:
matrix:
os:
- ubuntu-latest
go: ['1.13.x', '1.18.x']
go: ['1.20.x', '1.21.x']
include:
- os: windows-latest
go: '1.18.x'
go: '1.21.x'
- os: macos-latest
go: '1.18.x'
go: '1.21.x'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
java: "17"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: ${{ matrix.java }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test-javascript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ jobs:
matrix:
os:
- ubuntu-latest
node-version: ["12.x", "14.x", "16.x", "17.x", "18.x"]
node-version: ["18.x", "20.x"]
include:
- os: windows-latest
node-version: "18.x"
node-version: "20.x"
- os: macos-latest
node-version: "18.x"
node-version: "20.x"

steps:
- name: set git core.autocrlf to 'input'
run: git config --global core.autocrlf input

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: with Node.js ${{ matrix.node-version }} on ${{ matrix.os }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-perl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: install cpanm and multiple modules
uses: perl-actions/install-with-cpanm@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
composer-mode: ['low-deps', 'high-deps']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up PHP
uses: shivammathur/setup-php@v2
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/test-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,17 @@ jobs:
matrix:
os:
- ubuntu-latest
ruby: ["2.6", "2.7", "3.0", "3.1"]
ruby: ['2.6', '2.7', '3.0', '3.1', '3.2']
include:
- os: macos-latest
ruby: "3.1"
ruby: '3.2'

steps:
- uses: actions/checkout@v3

- name: Set up Ruby
uses: ruby/setup-ruby@v1
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
working-directory: ruby

- run: bundle exec rake
working-directory: ruby
30 changes: 23 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,23 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [24.0.1] - 2023-12-21
### Fixed
- Update repo URLs ([#190](https://github.com/cucumber/messages/pull/190))

## [24.0.0] - 2023-11-24
### Added
- Add `stackTrace` prop to `Exception` message ([#182](https://github.com/cucumber/messages/pull/182))

## [23.0.0] - 2023-11-01
### Added
- Added Python implementation ([#165](https://github.com/cucumber/messages/pull/165))
- Added C++ implementation ([#152](https://github.com/cucumber/messages/pull/152))

### Changed
- [Ruby] Updated minimum Ruby version to 2.5 - ([#177](https://github.com/cucumber/messages/pull/177) [luke-hill](https://github.com/luke-hill))

## [22.0.0] - 2023-04-06
### Added
- Added source reference to parameter type ([#45](https://github.com/cucumber/messages/pull/145))
Expand Down Expand Up @@ -497,13 +510,16 @@ aggregated status.
### Added
- Protobuf messages for Go, Java, JavaScript, TypeScript and Ruby

[Unreleased]: https://github.com/cucumber/messages/compare/v22.0.0...main
[22.0.0]: https://github.com/cucumber/messages/compare/v21.0.1...main
[21.0.1]: https://github.com/cucumber/messages/compare/v21.0.0...main
[21.0.0]: https://github.com/cucumber/messages/compare/v20.0.0...main
[20.0.0]: https://github.com/cucumber/messages/compare/v19.1.4...main
[19.1.4]: https://github.com/cucumber/messages/compare/v19.1.3...main
[19.1.3]: https://github.com/cucumber/messages/compare/v19.1.2...main
[Unreleased]: https://github.com/cucumber/messages/compare/v24.0.1...HEAD
[24.0.1]: https://github.com/cucumber/messages/compare/v24.0.0...v24.0.1
[24.0.0]: https://github.com/cucumber/messages/compare/v23.0.0...v24.0.0
[23.0.0]: https://github.com/cucumber/messages/compare/v22.0.0...v23.0.0
[22.0.0]: https://github.com/cucumber/messages/compare/v21.0.1...v22.0.0
[21.0.1]: https://github.com/cucumber/messages/compare/v21.0.0...v21.0.1
[21.0.0]: https://github.com/cucumber/messages/compare/v20.0.0...v21.0.0
[20.0.0]: https://github.com/cucumber/messages/compare/v19.1.4...v20.0.0
[19.1.4]: https://github.com/cucumber/messages/compare/v19.1.3...v19.1.4
[19.1.3]: https://github.com/cucumber/messages/compare/v19.1.2...v19.1.3
[19.1.2]: https://github.com/cucumber/messages/compare/v19.1.1...v19.1.2
[19.1.1]: https://github.com/cucumber/messages/compare/v19.1.0...v19.1.1
[19.1.0]: https://github.com/cucumber/messages/compare/v19.0.0...v19.1.0
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ However, it does not contain the following information (but Cucumber Messages do
* Parameter types

This kind of information is required to produce rich reports and analytics, and is
used in [@cucumber/react](https://github.com/cucumber/cucumber-react) and [Cucumber Reports](https://reports.cucumber.io/).
used in [@cucumber/react-components](https://github.com/cucumber/react-components) and [Cucumber Reports](https://reports.cucumber.io/).

## Examples

Expand Down
2 changes: 1 addition & 1 deletion cpp/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.configured
.built
.cmade/
build/
ext/
stage/
21 changes: 8 additions & 13 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,35 +1,30 @@
cmake_minimum_required(VERSION 3.12 FATAL_ERROR)

project(cucumber-messages VERSION 1.0.0 LANGUAGES CXX)
project(cucumber_messages VERSION 1.0.0 LANGUAGES C CXX)

include(GNUInstallDirs)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

find_package(nlohmann_json CONFIG REQUIRED)

add_subdirectory(src)
add_subdirectory(src/lib/messages)

install(
TARGETS
cucumber-messages
EXPORT cucumber-messages-config
cucumber_messages_lib
EXPORT cucumber_messages-config
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)

install(
DIRECTORY "${CMAKE_SOURCE_DIR}/include/"
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cucumber
)

install(
EXPORT cucumber-messages-config
FILE cucumber-messages-config.cmake
EXPORT cucumber_messages-config
FILE cucumber_messages-config.cmake
NAMESPACE cucumber::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cucumber-messages
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cucumber_messages
)
2 changes: 1 addition & 1 deletion cpp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#syntax=docker/dockerfile:1.4
#syntax=docker/dockerfile:1.6

# Base image
FROM debian:bullseye-slim AS cpp
Expand Down
2 changes: 1 addition & 1 deletion cpp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SOURCES = \
$(shell find $(LIB_DIR) -name "*.[ch]pp")

HERE = $(shell pwd)
CMAKE_BUILDROOT = $(HERE)/build/root
CMAKE_BUILDROOT = $(HERE)/.cmade/env
CMAKELISTS = $(shell find . -name CMakeLists.txt)

help: ## Show this help
Expand Down
Loading

0 comments on commit 0cf353b

Please sign in to comment.