From 171481940491515a8c4256068b5a1b99f3e5d0b8 Mon Sep 17 00:00:00 2001 From: Michael Hatch Date: Tue, 6 Apr 2021 14:57:54 -0500 Subject: [PATCH 1/2] [ch65876]: bump ruby to 2.7.2 --- .github/workflows/gem_push_beta.yml | 58 +++++++++++++++++++++++++++ .github/workflows/gem_push_master.yml | 5 ++- .ruby-version | 2 +- .travis.yml | 30 -------------- Makefile | 21 ++++++++++ lib/tire/version.rb | 4 +- tire.gemspec | 8 +++- 7 files changed, 92 insertions(+), 36 deletions(-) create mode 100644 .github/workflows/gem_push_beta.yml delete mode 100644 .travis.yml create mode 100644 Makefile diff --git a/.github/workflows/gem_push_beta.yml b/.github/workflows/gem_push_beta.yml new file mode 100644 index 000000000..7bc80012e --- /dev/null +++ b/.github/workflows/gem_push_beta.yml @@ -0,0 +1,58 @@ +name: tire branch + +on: [pull_request] + +env: + BUNDLER_ACCESS_TOKEN: ${{ secrets.TECH_OPS_ACCESS_TOKEN }} + +jobs: + build: + name: Test + Build + Publish + runs-on: ubuntu-16.04 + env: + BUNDLER_ACCESS_TOKEN: ${{ secrets.TECH_OPS_ACCESS_TOKEN }} + + services: + mongo: + image: mongo:2.4.14 + ports: + - 27017:27017 + redis: + image: redis:4-alpine + ports: + - 6379:6379 + + steps: + - uses: actions/checkout@v2 + + - name: Set up Ruby 2.7 + uses: ruby/setup-ruby@v1 + + - name: Start ElasticSearch + run: docker run -d -p 9200:9200 gcr.io/cn-reg/devops/elasticsearch:0.90.5-2-dev + + - name: Configure Gem Cache + uses: actions/cache@v2 + with: + path: vendor/bundle + key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + ${{ runner.os }}-gems- + + - name: Setup Tests + run: | + gem install bundler:1.17.3 + bundle config rubygems.pkg.github.com x-access-token:$BUNDLER_ACCESS_TOKEN + make setup + + - name: Test + run: make test + + - name: Publish to GPR + run: | + mkdir -p $HOME/.gem + touch $HOME/.gem/credentials + chmod 0600 $HOME/.gem/credentials + printf -- "---\n:github: Bearer ${{ secrets.GITHUB_TOKEN }}\n" > $HOME/.gem/credentials + SC_PRERELEASE=true gem build *.gemspec + gem push -v --KEY github --host https://rubygems.pkg.github.com/sittercity *.gem diff --git a/.github/workflows/gem_push_master.yml b/.github/workflows/gem_push_master.yml index decd85ae9..3aab632e4 100644 --- a/.github/workflows/gem_push_master.yml +++ b/.github/workflows/gem_push_master.yml @@ -11,8 +11,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Ruby 2.5 - uses: actions/setup-ruby@v1 + + - name: Set up Ruby 2.7 + uses: ruby/setup-ruby@v1 - name: Publish to GPR run: | diff --git a/.ruby-version b/.ruby-version index 73462a5a1..fbafd6b60 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.1 +2.7.2 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 09a3beca8..000000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -# --------------------------------------------------------- -# Configuration file for http://travis-ci.org/#!/karmi/tire -# --------------------------------------------------------- - -language: ruby - -rvm: - - 1.8.7 - - 1.9.3 - - 2.0.0 - - jruby-19mode - -env: - - TEST_COMMAND="rake test:unit" - - TEST_COMMAND="rake test:integration" - -script: "bundle exec $TEST_COMMAND" - -services: - - elasticsearch - - redis - - mongodb - -matrix: - exclude: - - rvm: 1.8.7 - env: TEST_COMMAND="rake test:integration" - -notifications: - disable: true diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..2b2ebac8a --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +GEM_NAME = tire +GEM_SPEC = $(GEM_NAME).gemspec +GEM_VERSION = $(shell ruby -e 'puts Gem::Specification.load("$(GEM_SPEC)").version') +GEM = $(GEM_NAME)-$(GEM_VERSION).gem + +dist: $(GEM) + +$(GEM): $(GEM_SPEC) + gem build $(GEM_SPEC) + +setup: + bundle install + mkdir -p log + +.PHONY: setup + +test: + bundle exec rspec + +clean: + rm -f *.gem diff --git a/lib/tire/version.rb b/lib/tire/version.rb index cb264ea90..d53d7dd12 100644 --- a/lib/tire/version.rb +++ b/lib/tire/version.rb @@ -1,8 +1,8 @@ module Tire - VERSION = "1.0.0" + VERSION = "2.0.0" CHANGELOG =<<-END IMPORTANT CHANGES LATELY: - UPDATE TO RUBY 2.5 + UPDATE TO RUBY 2.7.2 END end diff --git a/tire.gemspec b/tire.gemspec index 789279b71..3e2dcd61d 100644 --- a/tire.gemspec +++ b/tire.gemspec @@ -2,9 +2,15 @@ $:.push File.expand_path("../lib", __FILE__) require "tire/version" +prerelease = ENV['SC_PRERELEASE'] == 'true' + Gem::Specification.new do |s| s.name = "tire" - s.version = Tire::VERSION + s.version = if prerelease + "#{Tire::VERSION}.pre#{Time.now.to_i}" + else + Tire::VERSION + end s.platform = Gem::Platform::RUBY s.summary = "Ruby client for Elasticsearch" s.homepage = "http://github.com/karmi/tire" From 17ac410db47214c495c8a32679ab1e988aaf32b5 Mon Sep 17 00:00:00 2001 From: Michael Hatch Date: Tue, 6 Apr 2021 15:03:18 -0500 Subject: [PATCH 2/2] [ch65876]: add azure login CI step --- .github/workflows/gem_push_beta.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/gem_push_beta.yml b/.github/workflows/gem_push_beta.yml index 7bc80012e..de966d2a0 100644 --- a/.github/workflows/gem_push_beta.yml +++ b/.github/workflows/gem_push_beta.yml @@ -28,6 +28,13 @@ jobs: - name: Set up Ruby 2.7 uses: ruby/setup-ruby@v1 + - name: Login To Google Container Registry + uses: azure/docker-login@v1 + with: + login-server: gcr.io + username: _json_key + password: ${{ secrets.CONTAINER_REGISTRY_CREDENTIALS }} + - name: Start ElasticSearch run: docker run -d -p 9200:9200 gcr.io/cn-reg/devops/elasticsearch:0.90.5-2-dev