From eded69ff45df3f083444edb3a5c3cddc7db25eb3 Mon Sep 17 00:00:00 2001 From: Jaymala Sinha Date: Thu, 3 Oct 2019 11:57:43 -0400 Subject: Enable expeditor and BK verification tests Enable publishing to rubygems Signed-off-by: Jaymala Sinha --- .expeditor/buildkite/verify.ps1 | 23 +++++++++++++++++++ .expeditor/config.yml | 51 +++++++++++++++++++++++++++++++++++++++++ .expeditor/update_version.sh | 14 +++++++++++ .expeditor/verify.pipeline.yml | 40 ++++++++++++++++++++++++++++++++ CHANGELOG.md | 8 ++++++- VERSION | 1 + 6 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 .expeditor/buildkite/verify.ps1 create mode 100644 .expeditor/config.yml create mode 100755 .expeditor/update_version.sh create mode 100644 .expeditor/verify.pipeline.yml create mode 100644 VERSION diff --git a/.expeditor/buildkite/verify.ps1 b/.expeditor/buildkite/verify.ps1 new file mode 100644 index 0000000..cb4e5c8 --- /dev/null +++ b/.expeditor/buildkite/verify.ps1 @@ -0,0 +1,23 @@ +echo "--- system details" +$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture' +Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize + +# Set-Item -Path Env:Path -Value ($Env:Path + ";C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin") +$Env:Path="C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\ruby26\bin;C:\ci-studio-common\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\cmd;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps;C:\Go\bin;C:\Users\ContainerAdministrator\go\bin" + + +ruby -v +bundle --version +gem -v + +echo "--- bundle install" +bundle install --jobs=7 --retry=3 --without docs debug + +echo "--- bundle env" +bundle env + +echo "+++ bundle exec rake" +bundle exec rake compile +bundle exec rake spec + +exit $LASTEXITCODE \ No newline at end of file diff --git a/.expeditor/config.yml b/.expeditor/config.yml new file mode 100644 index 0000000..bd914d7 --- /dev/null +++ b/.expeditor/config.yml @@ -0,0 +1,51 @@ +# Documentation available at https://expeditor.chef.io/docs/getting-started/ +--- +# Documentation available at https://expeditor.chef.io/docs/getting-started/ +--- +# Slack channel in Chef Software slack to send notifications about build failures, etc +slack: + notify_channel: + - chef-found-notify + +# This publish is triggered by the `built_in:publish_rubygems` artifact_action. +rubygems: + - ffi-yajl + - ffi-yajl-universal-java + +github: + # This deletes the GitHub PR branch after successfully merged into the release branch + delete_branch_on_merge: true + # allow bumping the minor release via label + minor_bump_labels: + - "Expeditor: Bump Version Minor" + # allow bumping the major release via label + major_bump_labels: + - "Expeditor: Bump Version Major" + +changelog: + rollup_header: Changes not yet released to rubygems.org + +# These actions are taken, in order they are specified, anytime a Pull Request is merged. +merge_actions: + - built_in:bump_version: + ignore_labels: + - "Expeditor: Skip Version Bump" + - "Expeditor: Skip All" + - bash:.expeditor/update_version.sh: + only_if: built_in:bump_version + - built_in:update_changelog: + ignore_labels: + - "Expeditor: Skip Changelog" + - "Expeditor: Skip All" + - built_in:build_gem: + only_if: built_in:bump_version + +promote: + actions: + - built_in:rollover_changelog + - built_in:publish_rubygems + +pipelines: + - verify: + description: Pull Request validation tests + public: true diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh new file mode 100755 index 0000000..c79a54b --- /dev/null +++ b/.expeditor/update_version.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# +# After a PR merge, Chef Expeditor will bump the PATCH version in the VERSION file. +# It then executes this file to update any other files/components with that new version. +# + +set -evx + +VERSION=$(cat VERSION) + +sed -i -r "s/^(\\s*)VERSION = \".+\"/\\1VERSION = \"$VERSION\"/" lib/mixlib/shellout/version.rb + +# Once Expeditor finshes executing this script, it will commit the changes and push +# the commit as a new tag corresponding to the value in the VERSION file. diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml new file mode 100644 index 0000000..ae9971f --- /dev/null +++ b/.expeditor/verify.pipeline.yml @@ -0,0 +1,40 @@ +steps: + +- label: run-lint-and-specs-ruby-2.4 + command: + - export USER="root" + - bundle install --jobs=7 --retry=3 --without docs development + - bundle exec rake + expeditor: + executor: + docker: + image: ruby:2.4-stretch + +- label: run-lint-and-specs-ruby-2.6 + command: + - export USER="root" + - bundle install --jobs=7 --retry=3 --without docs development + - bundle exec rake + expeditor: + executor: + docker: + image: ruby:2.6-stretch + +- label: run-lint-and-specs-jruby + command: + - bundle install --jobs=7 --retry=3 --without docs development + - export USER="root" + - bundle exec rake + expeditor: + executor: + docker: + image: jruby + +- label: run-specs-windows + command: + - /workdir/.expeditor/buildkite/verify.ps1 + expeditor: + executor: + docker: + host_os: windows + shell: ["powershell", "-Command"] diff --git a/CHANGELOG.md b/CHANGELOG.md index f886169..b2541ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -# Change Log +# ffi-yajl Log + + + + + + ## [Unreleased](https://github.com/chef/ffi-yajl/tree/HEAD) diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..a625450 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +2.3.1 \ No newline at end of file -- cgit v1.2.1