Skip to content

Commit 37de70a

Browse files
Merge pull request #2073 from gooddata/gsan-grif-524_3
Reimplement integration-e2e workflow
2 parents 74f3c5b + c06a175 commit 37de70a

File tree

3 files changed

+25
-5
lines changed

3 files changed

+25
-5
lines changed

.github/workflows/check.yaml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,25 @@ jobs:
2323
id: changed-files
2424
uses: tj-actions/changed-files@v45
2525

26+
gooddata-ruby-lcm-integration-e2e:
27+
needs:
28+
- prepare-env
29+
uses: ./.github/workflows/lcm-integration-e2e.yaml
30+
secrets: inherit
31+
permissions:
32+
id-token: write
33+
contents: read
34+
if: ${{ needs.prepare-env.outputs.branch == 'master' }}
35+
with:
36+
AUTO_MERGE: false
37+
base_branch: ${{ needs.prepare-env.outputs.branch }}
38+
pr_number: ${{ needs.prepare-env.outputs.pr_number }}
39+
java_version: '11'
40+
ruby_version: 'jruby-9.4.12.1'
41+
2642
gooddata-ruby-lcm-build-pipeline:
27-
#needs:
28-
# - gooddata-ruby-lcm-integration-e2e
43+
needs:
44+
- gooddata-ruby-lcm-integration-e2e
2945
permissions:
3046
contents: read
3147
id-token: write
@@ -97,7 +113,7 @@ jobs:
97113
needs:
98114
- prepare-env
99115
- gooddata-ruby-lcm-build-pipeline
100-
# - gooddata-ruby-fossa-licenses-validate-LR-ticket-zuul
116+
- gooddata-ruby-fossa-licenses-validate-LR-ticket-zuul
101117
steps:
102118
- name: Check if needed jobs succeeded
103119
uses: re-actors/alls-green@release/v1

lib/gooddata/rest/connection.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ class Connection
3333
TOKEN_PATH = '/gdc/account/token'
3434
KEYS_TO_SCRUB = [:password, :verifyPassword, :authorizationToken]
3535
API_LEVEL = 2
36-
KB = 1024
37-
MB = 1024 * KB
3836

3937
ID_LENGTH = 16
4038

spec/spec_helper.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@
4141

4242
GoodData::Environment.load
4343

44+
if RUBY_ENGINE == "jruby" && RUBY_ENGINE_VERSION >= '9.4.12.0'
45+
KB = 1024
46+
MB = 1024 * KB
47+
Psych::Parser.code_point_limit = 100 * MB
48+
end
49+
4450
RSpec::Expectations.configuration.warn_about_potential_false_positives = false
4551

4652
RSpec.configure do |config|

0 commit comments

Comments
 (0)