From cb2cfce7961eb2b619ecb48bc1a8fd8e1d25955c Mon Sep 17 00:00:00 2001 From: Ryuichi Sai Date: Sat, 10 Dec 2022 09:11:17 -0600 Subject: [PATCH 1/2] Update dependencies --- Gemfile.lock | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1e4cb29..fc196bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,7 @@ PATH remote: . specs: - adzerk_decision_sdk (1.0.0.pre.beta.5) - json (~> 2.1, >= 2.1.0) + adzerk_decision_sdk (1.0.0.pre.beta.13) typhoeus (~> 1.0, >= 1.0.1) GEM @@ -12,11 +11,10 @@ GEM byebug (11.1.1) coderay (1.1.2) diff-lcs (1.3) - ethon (0.12.0) - ffi (>= 1.3.0) - ffi (1.13.1) + ethon (0.16.0) + ffi (>= 1.15.0) + ffi (1.15.5) jaro_winkler (1.5.4) - json (2.3.1) method_source (0.9.2) parallel (1.19.1) parser (2.7.0.2) @@ -67,4 +65,4 @@ DEPENDENCIES rubocop (~> 0.66.0) BUNDLED WITH - 2.1.2 \ No newline at end of file + 2.1.2 From 41a218375095cfef1f72973766b400e7e8211e12 Mon Sep 17 00:00:00 2001 From: Ryuichi Sai Date: Sat, 10 Dec 2022 09:15:03 -0600 Subject: [PATCH 2/2] Use ruby's setup-ruby in github action --- .github/workflows/release.yml | 6 +++--- .github/workflows/ruby.yml | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0480f94..ea9634c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,9 +21,9 @@ jobs: git push --tags --force fi - name: set up ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.x + ruby-version: '2.6' - name: create credentials folder run: mkdir -p ~/.gem - name: create credentials file @@ -41,4 +41,4 @@ jobs: - name: build gem run: bundle exec rake build - name: publish gem - run: gem push ./pkg/adzerk_decision_sdk-*.gem \ No newline at end of file + run: gem push ./pkg/adzerk_decision_sdk-*.gem diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 09f6323..52e6d39 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -7,10 +7,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Ruby 2.6 - uses: actions/setup-ruby@v1 + - name: set up ruby + uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.x + ruby-version: '2.6' - name: Build and test with Rake run: | gem install bundler @@ -21,10 +21,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up Ruby 2.6 - uses: actions/setup-ruby@v1 + - name: set up ruby + uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.x + ruby-version: '2.6' - name: Update Version run: sed -i -r "s/VERSION = '[0-9a-z.-]+'\$/VERSION = '0.0.1.${GITHUB_REF##*/}'/g" lib/adzerk_decision_sdk/version.rb - name: Publish to Artifactory @@ -34,4 +34,4 @@ jobs: chmod 0600 $HOME/.gem/credentials curl -ugithub:${{ secrets.ARTIFACTORY_PASSWORD }} https://adzerkps.jfrog.io/artifactory/api/gems/gems/api/v1/api_key.yaml > ~/.gem/credentials rake build - gem push --host https://adzerkps.jfrog.io/artifactory/api/gems/gems pkg/*.gem \ No newline at end of file + gem push --host https://adzerkps.jfrog.io/artifactory/api/gems/gems pkg/*.gem