Skip to content

Commit

Permalink
Merge branch 'master' into lloeki/x64-not-x86
Browse files Browse the repository at this point in the history
  • Loading branch information
@TonyCTHsu
TonyCTHsu authored Nov 1, 2024
2 parents 34b9e67 + 17007f7 commit 3e252a5
Show file tree
Hide file tree
Showing 1,130 changed files with 1,739 additions and 2,959 deletions.
8 changes: 4 additions & 4 deletions .circleci/images/primary/Dockerfile-2.5.9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ RUN set -ex; \
# Set timezone to UTC by default
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime

# Set language
RUN locale-gen en_US.UTF-8
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en

Expand Down Expand Up @@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
# Install RubyGems
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

# Install RubyGems and Bundler
# Install a pinned RubyGems and Bundler
RUN gem update --system 3.3.26
RUN gem install bundler -v '~> 2.3.26'
RUN gem install bundler:2.3.26
ENV BUNDLE_SILENCE_ROOT_WARNING 1

RUN mkdir /app
Expand Down
8 changes: 4 additions & 4 deletions .circleci/images/primary/Dockerfile-2.6.10
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ RUN set -ex; \
# Set timezone to UTC by default
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime

# Set language
RUN locale-gen en_US.UTF-8
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en

Expand Down Expand Up @@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
# Install RubyGems
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

# Install RubyGems
# Install a pinned RubyGems and Bundler
RUN gem update --system 3.3.26
RUN gem install bundler -v '~> 2.3.26'
RUN gem install bundler:2.3.26
ENV BUNDLE_SILENCE_ROOT_WARNING 1

RUN mkdir /app
Expand Down
4 changes: 2 additions & 2 deletions .circleci/images/primary/Dockerfile-2.7.8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ RUN set -ex; \
# Set timezone to UTC by default
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime

# Set language
RUN locale-gen en_US.UTF-8
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en

Expand Down
8 changes: 4 additions & 4 deletions .circleci/images/primary/Dockerfile-3.0.7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ RUN set -ex; \
# Set timezone to UTC by default
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime

# Set language
RUN locale-gen en_US.UTF-8
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en

Expand Down Expand Up @@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
# Install RubyGems
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

# Upgrade RubyGems and Bundler
# Install a pinned RubyGems and Bundler
RUN gem update --system 3.3.26
RUN gem install bundler -v '~> 2.3.26'
RUN gem install bundler:2.3.26
ENV BUNDLE_SILENCE_ROOT_WARNING 1

RUN mkdir /app
Expand Down
8 changes: 4 additions & 4 deletions .circleci/images/primary/Dockerfile-3.1.6
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ RUN set -ex; \
# Set timezone to UTC by default
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime

# Set language
RUN locale-gen en_US.UTF-8
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en

Expand Down Expand Up @@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
# Install RubyGems
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

# Upgrade RubyGems and Bundler
# Install a pinned RubyGems and Bundler
RUN gem update --system 3.3.26
RUN gem install bundler -v '~> 2.3.26'
RUN gem install bundler:2.3.26
ENV BUNDLE_SILENCE_ROOT_WARNING 1

RUN mkdir /app
Expand Down
8 changes: 4 additions & 4 deletions .circleci/images/primary/Dockerfile-3.2.4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ RUN set -ex; \
# Set timezone to UTC by default
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime

# Set language
RUN locale-gen en_US.UTF-8
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en

Expand Down Expand Up @@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
# Install RubyGems
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

# Upgrade RubyGems and Bundler
# Install a pinned RubyGems and Bundler
RUN gem update --system 3.3.26
RUN gem install bundler -v '~> 2.3.26'
RUN gem install bundler:2.3.26
ENV BUNDLE_SILENCE_ROOT_WARNING 1

RUN mkdir /app
Expand Down
8 changes: 4 additions & 4 deletions .circleci/images/primary/Dockerfile-3.3.2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ RUN set -ex; \
# Set timezone to UTC by default
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime

# Set language
RUN locale-gen en_US.UTF-8
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en

Expand Down Expand Up @@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
# Install RubyGems
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

# Upgrade RubyGems and Bundler
# Install a pinned RubyGems and Bundler
RUN gem update --system 3.3.26
RUN gem install bundler -v '~> 2.3.26'
RUN gem install bundler:2.3.26
ENV BUNDLE_SILENCE_ROOT_WARNING 1

RUN mkdir /app
Expand Down
8 changes: 5 additions & 3 deletions .circleci/images/primary/Dockerfile-3.4.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ RUN set -ex; \
# Set timezone to UTC by default
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime

# Set language
RUN locale-gen en_US.UTF-8
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en

Expand Down Expand Up @@ -56,7 +56,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17

# Install RubyGems
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

# Install a pinned RubyGems and Bundler
RUN gem update --system 3.3.26
RUN gem install bundler:2.3.26
ENV BUNDLE_SILENCE_ROOT_WARNING 1

RUN mkdir /app
Expand Down
4 changes: 2 additions & 2 deletions .circleci/images/primary/Dockerfile-jruby-9.2.21.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
# Install RubyGems
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

# Upgrade RubyGems and Bundler
# Install a pinned RubyGems and Bundler
RUN gem update --system 3.3.26
RUN gem install bundler -v '~> 2.3.26'
RUN gem install bundler:2.3.26
ENV BUNDLE_SILENCE_ROOT_WARNING 1

# Ensure JRuby is available when running "bash --login"
Expand Down
4 changes: 2 additions & 2 deletions .circleci/images/primary/Dockerfile-jruby-9.3.9.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
# Install RubyGems
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

# Upgrade RubyGems and Bundler
# Install a pinned RubyGems and Bundler
RUN gem update --system 3.3.26
RUN gem install bundler -v '~> 2.3.26'
RUN gem install bundler:2.3.26
ENV BUNDLE_SILENCE_ROOT_WARNING 1

# Ensure JRuby is available when running "bash --login"
Expand Down
4 changes: 2 additions & 2 deletions .circleci/images/primary/Dockerfile-jruby-9.4.7.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
# Install RubyGems
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"

# Upgrade RubyGems and Bundler
# Install a pinned RubyGems and Bundler
RUN gem update --system 3.3.26
RUN gem install bundler -v '~> 2.3.26'
RUN gem install bundler:2.3.26
ENV BUNDLE_SILENCE_ROOT_WARNING 1

# Ensure JRuby is available when running "bash --login"
Expand Down
6 changes: 0 additions & 6 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,3 @@ end
group :dev do
gem 'ruby-lsp', require: false if RUBY_VERSION >= '3.0.0' && RUBY_PLATFORM != 'java'
end

# `1.17.0` provides broken RBS type definitions
# https://github.com/ffi/ffi/blob/master/CHANGELOG.md#1170rc1--2024-04-08
#
# TODO: Remove this once the issue is resolved: https://github.com/ffi/ffi/issues/1107
gem 'ffi', '~> 1.16.3', require: false
6 changes: 3 additions & 3 deletions Steepfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,6 @@ target :datadog do

repo_path 'vendor/rbs'
library 'cucumber'
library 'ffi'
library 'jruby'
library 'gem'
library 'rails'
Expand All @@ -575,7 +574,8 @@ target :datadog do
library 'graphql'
library 'datadog-ci'

# TODO: gem 'libddwaf'
library 'libddwaf'
# ffi version 1.17 was shipped with invalid rbs types:
# https://github.com/ffi/ffi/issues/1107
library 'libddwaf-stub'
library 'libdatadog'
end
2 changes: 1 addition & 1 deletion datadog.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'datadog-ruby_core_source', '~> 3.3'

# Used by appsec
spec.add_dependency 'libddwaf', '~> 1.14.0.0.0'
spec.add_dependency 'libddwaf', '~> 1.15.0.0.0'

# When updating the version here, please also update the version in `libdatadog_extconf_helpers.rb`
# (and yes we have a test for it)
Expand Down
1 change: 0 additions & 1 deletion gemfiles/jruby_9.2_activesupport.gemfile
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions gemfiles/jruby_9.2_activesupport.gemfile.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion gemfiles/jruby_9.2_aws.gemfile
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions gemfiles/jruby_9.2_aws.gemfile.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion gemfiles/jruby_9.2_contrib.gemfile
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions gemfiles/jruby_9.2_contrib.gemfile.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion gemfiles/jruby_9.2_contrib_old.gemfile
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions gemfiles/jruby_9.2_contrib_old.gemfile.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion gemfiles/jruby_9.2_core_old.gemfile
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3e252a5

Please sign in to comment.