From 368aac90742b7301f47189656b198dfa9f7f869f Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Thu, 24 Aug 2023 15:45:06 -0600 Subject: [PATCH] Prep for v8.1.2 (#5681) * version bump * see if we can work around the docker limits by not using docker * fixes for evergreen distros * apparently spec/shared wants .mod/drivers-evergreen-tools * bump min bson version for mongo compatibility --- .evergreen/config.yml | 29 +++++++++++++++++------------ .evergreen/config/axes.yml.erb | 13 ++++--------- .evergreen/config/commands.yml.erb | 2 +- .evergreen/config/variants.yml.erb | 2 +- .gitmodules | 3 +++ .mod/drivers-evergreen-tools | 1 + gemfiles/bson_min.gemfile | 2 +- lib/mongoid/version.rb | 2 +- 8 files changed, 29 insertions(+), 25 deletions(-) create mode 160000 .mod/drivers-evergreen-tools diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 1eda42aa3a..9aaf8e7c84 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -38,6 +38,16 @@ functions: git submodule update --init --recursive + "fetch egos": + - command: shell.exec + params: + working_dir: "src" + script: | + set -ex + + curl -sfLo egos https://raw.githubusercontent.com/p-mongo/egos/master/egos + chmod +x ./egos + "create expansions": # Make an evergreen exapanstion file with dynamic values - command: shell.exec @@ -272,8 +282,7 @@ functions: DRIVER="${DRIVER}" \ I18N="${I18N}" \ TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \ - FLE="${FLE}" \ - .evergreen/run-tests-docker.sh + .evergreen/run-tests.sh "fix absolute paths": - command: shell.exec @@ -296,6 +305,7 @@ functions: pre: - func: "fetch source" + - func: "fetch egos" - func: "create expansions" - func: "fix absolute paths" - func: "install dependencies" @@ -432,24 +442,19 @@ axes: - id: "os" display_name: OS values: - - id: ubuntu-18.04 - display_name: "Ubuntu 18.04" - run_on: ubuntu2004-small - variables: - DOCKER_DISTRO: ubuntu1804 - id: ubuntu-22.04 - display_name: "Ubuntu 20.04" - run_on: ubuntu2004-small + display_name: "Ubuntu 22.04" + run_on: ubuntu2204-small variables: DOCKER_DISTRO: ubuntu2204 - id: debian11 display_name: "Debian 11" - run_on: ubuntu2004-small + run_on: debian11-small variables: DOCKER_DISTRO: debian11 - id: rhel80 display_name: "RHEL 8.0" - run_on: ubuntu2004-small + run_on: rhel80-small variables: DOCKER_DISTRO: rhel80 @@ -791,7 +796,7 @@ buildvariants: topology: standalone app-tests: yes rails: ['6.0'] - os: ubuntu-18.04 + os: ubuntu-22.04 display_name: "app tests ${driver}, ${jruby}" tasks: - name: "test" diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb index c5e8b8f878..96e07e00d7 100644 --- a/.evergreen/config/axes.yml.erb +++ b/.evergreen/config/axes.yml.erb @@ -119,24 +119,19 @@ axes: - id: "os" display_name: OS values: - - id: ubuntu-18.04 - display_name: "Ubuntu 18.04" - run_on: ubuntu2004-small - variables: - DOCKER_DISTRO: ubuntu1804 - id: ubuntu-22.04 - display_name: "Ubuntu 20.04" - run_on: ubuntu2004-small + display_name: "Ubuntu 22.04" + run_on: ubuntu2204-small variables: DOCKER_DISTRO: ubuntu2204 - id: debian11 display_name: "Debian 11" - run_on: ubuntu2004-small + run_on: debian11-small variables: DOCKER_DISTRO: debian11 - id: rhel80 display_name: "RHEL 8.0" - run_on: ubuntu2004-small + run_on: rhel80-small variables: DOCKER_DISTRO: rhel80 diff --git a/.evergreen/config/commands.yml.erb b/.evergreen/config/commands.yml.erb index 9cc142fddf..be252245a2 100644 --- a/.evergreen/config/commands.yml.erb +++ b/.evergreen/config/commands.yml.erb @@ -256,7 +256,7 @@ functions: DRIVER="${DRIVER}" \ I18N="${I18N}" \ TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \ - ./egos .evergreen/run-tests-docker.sh + .evergreen/run-tests.sh "fix absolute paths": - command: shell.exec diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb index 43098d9f1f..c105a14f12 100644 --- a/.evergreen/config/variants.yml.erb +++ b/.evergreen/config/variants.yml.erb @@ -227,7 +227,7 @@ buildvariants: topology: standalone app-tests: yes rails: ['6.0'] - os: ubuntu-18.04 + os: ubuntu-22.04 display_name: "app tests ${driver}, ${jruby}" tasks: - name: "test" diff --git a/.gitmodules b/.gitmodules index 805feb77d5..05f15e6b98 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "spec/shared"] path = spec/shared url = https://github.com/mongodb-labs/mongo-ruby-spec-shared +[submodule ".mod/drivers-evergreen-tools"] + path = .mod/drivers-evergreen-tools + url = https://github.com/mongodb-labs/drivers-evergreen-tools diff --git a/.mod/drivers-evergreen-tools b/.mod/drivers-evergreen-tools new file mode 160000 index 0000000000..88feab39cf --- /dev/null +++ b/.mod/drivers-evergreen-tools @@ -0,0 +1 @@ +Subproject commit 88feab39cf81eef96d80a04bde5bf4003d6e1a93 diff --git a/gemfiles/bson_min.gemfile b/gemfiles/bson_min.gemfile index 14ff0a2da1..ed5db14a68 100644 --- a/gemfiles/bson_min.gemfile +++ b/gemfiles/bson_min.gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gemspec path: '..' -gem 'bson', '4.14.0' +gem 'bson', '4.14.1' gem 'mongo' gem 'actionpack' diff --git a/lib/mongoid/version.rb b/lib/mongoid/version.rb index 1f997e0675..617754dd25 100644 --- a/lib/mongoid/version.rb +++ b/lib/mongoid/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Mongoid - VERSION = "8.1.1" + VERSION = "8.1.2" end