Skip to content

Commit

Permalink
Merge pull request #8 from Appboy/braze-1.1.0
Browse files Browse the repository at this point in the history 
Braze Modifications for 1.1.0
  • Loading branch information
@zachmccormick
zachmccormick authored May 9, 2023
2 parents 6e644ea + 512a8c4 commit 47a3d0c
Show file tree
Hide file tree
Showing 2,594 changed files with 158,177 additions and 134,816 deletions.
139 changes: 101 additions & 38 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ test_containers:
- &container_base_environment
BUNDLE_GEMFILE: /app/Gemfile
JRUBY_OPTS: --dev # Faster JVM startup: https://github.com/jruby/jruby/wiki/Improving-startup-time#use-the---dev-flag
GRPC_RUBY_BUILD_PROCS: 8 # Override number of concurrent compiles in grpc gem, see https://github.com/grpc/grpc/pull/28250 and https://github.com/DataDog/dd-trace-rb/issues/1791
- &container_parameters_environment
- *container_base_environment
- TEST_DATADOG_INTEGRATION: 1
Expand Down Expand Up @@ -61,7 +62,12 @@ test_containers:
- MYSQL_USER=mysql
- &mysql_port 3306
- &container_elasticsearch
image: elasticsearch:2.4
image: elasticsearch:8.1.3
environment:
# Ensure production cluster requirements are not enforced
- discovery.type=single-node
- xpack.security.enabled=false
- ES_JAVA_OPTS=-Xms750m -Xmx750m
- &elasticsearch_port 9200
- &container_redis
image: redis:3.0
Expand Down Expand Up @@ -128,6 +134,7 @@ step_appraisal_install: &step_appraisal_install
if [ "$CI_BUNDLE_CACHE_HIT" != 1 ]; then
bundle exec appraisal install
else
bundle exec appraisal generate # Generate the appraisal files to match the lockfiles in the tree
echo "All required gems were found in cache."
fi
step_appraisal_update: &step_appraisal_update
Expand Down Expand Up @@ -483,24 +490,31 @@ job_configuration:
- &config-3_0
<<: *filters_all_branches_and_tags
ruby_version: '3.0'
image: ivoanjo/docker-library:ddtrace_rb_3_0_1
image: ivoanjo/docker-library:ddtrace_rb_3_0_3
- &config-3_1
<<: *filters_all_branches_and_tags
ruby_version: '3.1'
image: ivoanjo/docker-library:ddtrace_rb_3_1_0_preview1
resource_class_to_use: xlarge # Temporary, see https://github.com/DataDog/dd-trace-rb/issues/1791
image: ivoanjo/docker-library:ddtrace_rb_3_1_1
- &config-3_2
<<: *filters_all_branches_and_tags
ruby_version: '3.2'
image: ivoanjo/docker-library:ddtrace_rb_3_2_0_preview1
# ADD NEW RUBIES HERE
# JRuby
- &config-jruby-9_2_0_0 # Oldest supported version
- &config-jruby-9_2_8_0 # Test with older 9.2 release because 9.2.9.0 changed behavior, see https://github.com/DataDog/dd-trace-rb/pull/1409
<<: *filters_all_branches_and_tags
ruby_version: 'jruby-9.2.0.0'
image: ivoanjo/docker-library:ddtrace_rb_jruby_9_2_0_0
ruby_version: 'jruby-9.2.8.0'
image: ivoanjo/docker-library:ddtrace_rb_jruby_9_2_8_0
resource_class_to_use: medium+
- &config-jruby-9_2-latest # More recent release of 9.2
<<: *filters_all_branches_and_tags
ruby_version: 'jruby-9.2-latest'
image: ivoanjo/docker-library:ddtrace_rb_jruby_9_2_18_0
# TruffleRuby
resource_class_to_use: medium+
- &config-jruby-9_3-latest
<<: *filters_all_branches_and_tags
ruby_version: 'jruby-9.3-latest'
image: ivoanjo/docker-library:ddtrace_rb_jruby_9_3_4_0
resource_class_to_use: medium+
- &config-truffleruby-21_0_0
<<: *filters_all_branches_and_tags
ruby_version: 'truffleruby-21.0.0'
Expand Down Expand Up @@ -534,9 +548,12 @@ workflows:
- test-2.7
- test-3.0
- test-3.1
# TODO: Re-enable once 3.2 testing is green!
#- test-3.2
# ADD NEW RUBIES HERE
- test-jruby-9.2.0.0
- test-jruby-9.2.8.0
- test-jruby-9.2-latest
- test-jruby-9.3-latest
# soon™️ - test-truffleruby-21.0.0
- orb/changelog:
<<: *config-2_7
Expand Down Expand Up @@ -569,31 +586,35 @@ workflows:
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.5
integration_apps: 'rack rails-five'
integration_apps: 'rack rails-five rails-six'
ruby_version: '2.5'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.6
integration_apps: 'rack rails-five'
integration_apps: 'rack rails-five rails-six'
ruby_version: '2.6'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.7
integration_apps: 'rack rails-five'
integration_apps: 'rack rails-five rails-six rails-seven'
ruby_version: '2.7'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-3.0
# Note: Ruby 3 is not supported by Rails 5, hence we skip it
integration_apps: 'rack'
integration_apps: 'rack rails-six rails-seven'
ruby_version: '3.0'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-3.1
# Note: Ruby 3 is not supported by Rails 5, hence we skip it
integration_apps: 'rack'
integration_apps: 'rack rails-six rails-seven'
ruby_version: '3.1'
<<: *filters_all_branches_and_tags
# TODO: Re-enable once 3.2 testing is green!
# - orb/build_and_test_integration:
# name: build_and_test_integration-3.2
# integration_apps: 'rack rails-six rails-seven'
# ruby_version: '3.2'
# <<: *filters_all_branches_and_tags
# ADD NEW RUBIES HERE
# MRI
- orb/build:
Expand Down Expand Up @@ -673,16 +694,24 @@ workflows:
name: test-3.1
requires:
- build-3.1
- orb/build:
<<: *config-3_2
name: build-3.2
# TODO: Re-enable once 3.2 testing is green!
# - orb/test:
# <<: *config-3_2
# name: test-3.2
# requires:
# - build-3.2
# ADD NEW RUBIES HERE
# JRuby
- orb/build:
<<: *config-jruby-9_2_0_0
name: build-jruby-9.2.0.0
<<: *config-jruby-9_2_8_0
name: build-jruby-9.2.8.0
- orb/test:
<<: *config-jruby-9_2_0_0
name: test-jruby-9.2.0.0
<<: *config-jruby-9_2_8_0
name: test-jruby-9.2.8.0
requires:
- build-jruby-9.2.0.0
- build-jruby-9.2.8.0
- orb/build:
<<: *config-jruby-9_2-latest
name: build-jruby-9.2-latest
Expand All @@ -691,6 +720,14 @@ workflows:
name: test-jruby-9.2-latest
requires:
- build-jruby-9.2-latest
- orb/build:
<<: *config-jruby-9_3-latest
name: build-jruby-9.3-latest
- orb/test:
<<: *config-jruby-9_3-latest
name: test-jruby-9.3-latest
requires:
- build-jruby-9.3-latest
# TruffleRuby
# soon™️
# - orb/build:
Expand All @@ -716,9 +753,12 @@ workflows:
- test-2.7
- test-3.0
- test-3.1
# TODO: Re-enable once 3.2 testing is green!
#- test-3.2
# ADD NEW RUBIES HERE
- test-jruby-9.2.0.0
- test-jruby-9.2.8.0
- test-jruby-9.2-latest
- test-jruby-9.3-latest
# soon™️ - test-truffleruby-21.0.0
- "deploy release":
<<: *filters_only_release_tags
Expand All @@ -734,9 +774,12 @@ workflows:
- test-2.7
- test-3.0
- test-3.1
# TODO: Re-enable once 3.2 testing is green!
#- test-3.2
# ADD NEW RUBIES HERE
- test-jruby-9.2.0.0
- test-jruby-9.2.8.0
- test-jruby-9.2-latest
- test-jruby-9.3-latest
# soon™️ - test-truffleruby-21.0.0
# This workflow runs the same `build` and `test` jobs as above on a schedule.
# Tasks related to housekeeping (e.g. prerelease) are not relevant
Expand Down Expand Up @@ -773,31 +816,35 @@ workflows:
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.5
integration_apps: 'rack rails-five'
integration_apps: 'rack rails-five rails-six'
ruby_version: '2.5'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.6
integration_apps: 'rack rails-five'
integration_apps: 'rack rails-five rails-six'
ruby_version: '2.6'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.7
integration_apps: 'rack rails-five'
integration_apps: 'rack rails-five rails-six rails-seven'
ruby_version: '2.7'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-3.0
# Note: Ruby 3 is not supported by Rails 5, hence we skip it
integration_apps: 'rack'
integration_apps: 'rack rails-six rails-seven'
ruby_version: '3.0'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-3.1
# Note: Ruby 3 is not supported by Rails 5, hence we skip it
integration_apps: 'rack'
integration_apps: 'rack rails-six rails-seven'
ruby_version: '3.1'
<<: *filters_all_branches_and_tags
# TODO: Re-enable once 3.2 testing is green!
# - orb/build_and_test_integration:
# name: build_and_test_integration-3.2
# integration_apps: 'rack rails-six rails-seven'
# ruby_version: '3.2'
# <<: *filters_all_branches_and_tags
# ADD NEW RUBIES HERE
# MRI
- orb/build:
Expand Down Expand Up @@ -877,16 +924,24 @@ workflows:
name: test-3.1
requires:
- build-3.1
- orb/build:
<<: *config-3_2
name: build-3.2
# TODO: Re-enable once 3.2 testing is green!
# - orb/test:
# <<: *config-3_2
# name: test-3.2
# requires:
# - build-3.2
# ADD NEW RUBIES HERE
# JRuby
- orb/build:
<<: *config-jruby-9_2_0_0
name: build-jruby-9.2.0.0
<<: *config-jruby-9_2_8_0
name: build-jruby-9.2.8.0
- orb/test:
<<: *config-jruby-9_2_0_0
name: test-jruby-9.2.0.0
<<: *config-jruby-9_2_8_0
name: test-jruby-9.2.8.0
requires:
- build-jruby-9.2.0.0
- build-jruby-9.2.8.0
- orb/build:
<<: *config-jruby-9_2-latest
name: build-jruby-9.2-latest
Expand All @@ -895,6 +950,14 @@ workflows:
name: test-jruby-9.2-latest
requires:
- build-jruby-9.2-latest
- orb/build:
<<: *config-jruby-9_3-latest
name: build-jruby-9.3-latest
- orb/test:
<<: *config-jruby-9_3-latest
name: test-jruby-9.3-latest
requires:
- build-jruby-9.3-latest
# TruffleRuby
# soon™️
# - orb/build:
Expand Down
73 changes: 0 additions & 73 deletions .circleci/images/primary/Dockerfile-3.0.1
View file

This file was deleted.

Loading

0 comments on commit 47a3d0c

Please sign in to comment.