Merge pull request #40 from solarwindscloud/fix_4_linux_test

Fix 4 linux test
solarwinds · Oct 6, 2023 · 280aba3 · 280aba3
2 parents 328c86b + 29fcbb5
commit 280aba3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/test_on_4_linux.yml b/.github/workflows/test_on_4_linux.yml
@@ -77,7 +77,7 @@ jobs:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
       mysql:
-        image: mariadb:latest
+        image: mariadb:10.9.6
         env:
           MYSQL_USER: user
           MYSQL_PASSWORD: password

diff --git a/gemfiles/delayed_job.gemfile b/gemfiles/delayed_job.gemfile
@@ -3,7 +3,13 @@ source "https://rubygems.org"
 gem 'pg'
 gem "delayed_job_active_record"
 
-gem "rails"
+# DEPRECATION WARNING: ActiveRecord::Base.default_timezone is deprecated and will be removed in Rails 7.1.
+# new change for delayed_job_active_record will be next release: https://github.com/collectiveidea/delayed_job_active_record/pull/216/files
+if RUBY_VERSION < '2.7'
+	gem "rails"
+else
+	gem "rails", '~> 7.0.0'
+end
 
 eval(File.read(File.join(File.dirname(__FILE__), 'test_gems.gemfile')))
 

diff --git a/gemfiles/libraries.gemfile b/gemfiles/libraries.gemfile
@@ -37,7 +37,7 @@ gem 'faraday', '~> 1.0'
 # gem 'faraday-httpclient'
 # gem 'faraday-patron'
 
-if RUBY_VERSION < '2.6'
+if RUBY_VERSION < '2.7'
   gem 'graphql', '< 1.13.0'
 else
   gem 'graphql'

diff --git a/test/run_tests/Dockerfile_alpine b/test/run_tests/Dockerfile_alpine
@@ -59,6 +59,7 @@ RUN apk add --upgrade \
       vim \
       yaml \
       zlib-dev \
+      yaml-dev \
       icu-libs \ 
    && rm -rf /var/lib/apt/lists/*
 

diff --git a/test/run_tests/Dockerfile_amzlinux b/test/run_tests/Dockerfile_amzlinux
@@ -37,6 +37,7 @@ RUN yum update -y && yum install -y \
        tree \
        bison \
        libxml2-devel \
+       libyaml-devel \
        libxslt-devel \
        && rm -rf /var/lib/apt/lists/*
 

diff --git a/test/run_tests/Dockerfile_debian b/test/run_tests/Dockerfile_debian
@@ -33,6 +33,7 @@ RUN apt-get update \
           vim \
           zlib1g-dev \
           libxslt1-dev \
+          libyaml-dev \
           libxml2-dev \
     && rm -rf /var/lib/apt/lists/*