From 176bbc45843f316ab7eba0432166c875ad616677 Mon Sep 17 00:00:00 2001 From: Andrei Subbota Date: Thu, 25 Dec 2025 04:05:34 +0100 Subject: [PATCH 1/5] Update danger workflows --- .github/workflows/danger-comment.yml | 10 ++++++++++ .github/workflows/danger.yml | 24 ++++++------------------ 2 files changed, 16 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/danger-comment.yml diff --git a/.github/workflows/danger-comment.yml b/.github/workflows/danger-comment.yml new file mode 100644 index 0000000..c22c327 --- /dev/null +++ b/.github/workflows/danger-comment.yml @@ -0,0 +1,10 @@ +name: Danger Comment +on: + workflow_run: + workflows: [Danger] + types: [completed] + +jobs: + comment: + uses: ruby-grape/danger/.github/workflows/danger-comment.yml@master + secrets: inherit diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 4d4e6ae..c65d2e9 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -1,21 +1,9 @@ -name: danger -on: pull_request +name: Danger +on: + pull_request: + types: [ opened, reopened, edited, synchronize ] jobs: danger: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 100 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: 3.2 - bundler-cache: true - rubygems: latest - - name: Run Danger - run: | - # the token is public, has public_repo scope and belongs to the grape-bot user owned by @dblock, this is ok - TOKEN=$(echo -n Z2hwX2lYb0dPNXNyejYzOFJyaTV3QUxUdkNiS1dtblFwZTFuRXpmMwo= | base64 --decode) - DANGER_GITHUB_API_TOKEN=$TOKEN bundle exec danger --verbose + uses: ruby-grape/danger/.github/workflows/danger-run.yml@master + secrets: inherit From 4009d3ccb46a1a2877c8f7b444d0ae0b62ace0da Mon Sep 17 00:00:00 2001 From: Andrei Subbota Date: Thu, 25 Dec 2025 04:14:22 +0100 Subject: [PATCH 2/5] Bump ruby-grape-danger version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index c5c4b7e..1718ad0 100644 --- a/Gemfile +++ b/Gemfile @@ -44,6 +44,6 @@ end group :test do gem 'grape-entity', grape_entity_spec - gem 'ruby-grape-danger', '~> 0.2.1', require: false + gem 'ruby-grape-danger', '~> 0.3.0', require: false gem 'simplecov', require: false end From df5056a4c586965af73962fe39908bbba5068f9c Mon Sep 17 00:00:00 2001 From: Andrei Subbota Date: Thu, 25 Dec 2025 05:36:52 +0100 Subject: [PATCH 3/5] Switch workflow --- .github/workflows/danger-comment.yml | 2 +- .github/workflows/danger.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/danger-comment.yml b/.github/workflows/danger-comment.yml index c22c327..8eb900f 100644 --- a/.github/workflows/danger-comment.yml +++ b/.github/workflows/danger-comment.yml @@ -6,5 +6,5 @@ on: jobs: comment: - uses: ruby-grape/danger/.github/workflows/danger-comment.yml@master + uses: numbata/danger-pr-comment/.github/workflows/danger-comment.yml@main secrets: inherit diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index c65d2e9..11784b6 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -1,9 +1,9 @@ name: Danger on: pull_request: - types: [ opened, reopened, edited, synchronize ] + types: [opened, reopened, edited, synchronize] jobs: danger: - uses: ruby-grape/danger/.github/workflows/danger-run.yml@master + uses: numbata/danger-pr-comment/.github/workflows/danger-run.yml@main secrets: inherit From 3bf32644d70774cfe3ebb3b5d15f7c0668b44a8a Mon Sep 17 00:00:00 2001 From: Andrei Subbota Date: Thu, 25 Dec 2025 05:39:59 +0100 Subject: [PATCH 4/5] Specify ruby version --- .github/workflows/danger.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 11784b6..947f5ad 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -7,3 +7,5 @@ jobs: danger: uses: numbata/danger-pr-comment/.github/workflows/danger-run.yml@main secrets: inherit + with: + ruby-version: "3.2" From 6209bf81b2ca9c6b7b713f49c771d0262e0ad0ba Mon Sep 17 00:00:00 2001 From: Andrei Subbota Date: Thu, 25 Dec 2025 05:42:49 +0100 Subject: [PATCH 5/5] Fix rubocop offenses --- CHANGELOG.md | 1 + lib/grape-swagger/entity/parser.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e05f25..3de23d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ #### Fixes * Your contribution here. +* [#88](https://github.com/ruby-grape/grape-swagger-entity/pull/88): Update danger workflows - [@numbata](https://github.com/numbata). ### 0.7.0 (2025/08/02) diff --git a/lib/grape-swagger/entity/parser.rb b/lib/grape-swagger/entity/parser.rb index 34c0b56..31443f0 100644 --- a/lib/grape-swagger/entity/parser.rb +++ b/lib/grape-swagger/entity/parser.rb @@ -111,7 +111,7 @@ def parse_nested(entity_name, entity_options, parent_model = nil) .map(&:nested_exposures) .flatten .each_with_object({}) do |value, memo| - memo[value.attribute] = value.send(:options) + memo[value.attribute] = value.send(:options) end properties, required = parse_grape_entity_params(params, nested_entities.last)