From 530703f0082416fab0d1efe5a413f4eac6242a46 Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Thu, 21 Apr 2022 14:52:56 -0500 Subject: [PATCH 01/40] Some initial "get it working with ruby 3" --- Gemfile | 3 +- Gemfile.lock | 114 ++++++++++++++++++----------------- lib/origen/pins.rb | 8 ++- lib/origen/pins/pin.rb | 15 +++-- lib/origen/version_string.rb | 2 +- origen.gemspec | 7 ++- 6 files changed, 83 insertions(+), 66 deletions(-) diff --git a/Gemfile b/Gemfile index 0002a521..7942198d 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,8 @@ gem "loco" #gem "origen_testers", "~> 0.7" gem 'origen_debuggers', '~> 0' gem 'ripper-tags' -gem 'nokogiri', '1.10.10' # Lock to this version to enable testing in Ruby 2.2 +# gem 'nokogiri', '1.10.10' # Lock to this version to enable testing in Ruby 2.2 +gem 'nokogiri' # Plugins that provide guide pages gem "origen_testers", git: "https://github.com/Origen-SDK/origen_testers.git" diff --git a/Gemfile.lock b/Gemfile.lock index 4fdef7eb..dcf04d3b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,11 +24,12 @@ GIT GIT remote: https://github.com/Origen-SDK/origen_testers.git - revision: 27537eb1bcc39b6995bc28c4f2ead4187e26c7b9 + revision: 48cd797b5003cebe02bbae6175a1e3ca9bb6aa1f specs: - origen_testers (0.48.2) + origen_testers (0.49.4) ast (~> 2) atp (~> 1.1, >= 1.1.3) + dentaku (~> 3) origen (>= 0.57.1) origen_stil (>= 0.2.1) require_all (~> 1) @@ -47,7 +48,6 @@ PATH colored (~> 1.2) colorize (~> 0.8.1) concurrent-ruby - cri (~> 2.10.0) dentaku (~> 3) gems (~> 0.8) highline (~> 1.7) @@ -55,12 +55,12 @@ PATH kramdown (~> 1.5) nanoc (~> 3.7.0) net-ldap (~> 0.13) - nokogiri (>= 1.7.2) + nokogiri (>= 1.11.0) pry (~> 0.10) rake (~> 10) rspec (~> 3) rspec-legacy_formatters (~> 1) - rubocop (= 0.30) + rubocop scrub_rb (~> 1.0) simplecov (~> 0.17) simplecov-html (~> 0.10) @@ -75,9 +75,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - ast (2.4.1) - astrolabe (1.3.1) - parser (~> 2.2) + ast (2.4.2) atp (1.1.3) ast (~> 2) origen (>= 0.2.3) @@ -87,53 +85,50 @@ GEM coderay (1.1.3) colored (1.2) colorize (0.8.1) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) coveralls (0.7.1) multi_json (~> 1.3) rest-client simplecov (>= 0.7) term-ansicolor thor - cri (2.10.1) - colored (~> 1.2) - dentaku (3.4.2) + cri (2.15.11) + dentaku (3.5.0) concurrent-ruby - diff-lcs (1.4.4) - docile (1.3.5) + diff-lcs (1.5.0) + docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dry-inflector (0.2.0) gems (0.8.3) highline (1.7.10) http-accept (1.7.0) - http-cookie (1.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) httparty (0.20.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) i18n (0.9.5) concurrent-ruby (~> 1.0) - json (2.5.1) + json (2.6.1) kramdown (1.17.0) loco (0.0.7) method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) - mini_portile2 (2.4.0) - minitest (5.14.4) + mime-types-data (3.2022.0105) + minitest (5.15.0) multi_json (1.15.0) multi_xml (0.6.0) nanoc (3.7.5) cri (~> 2.3) net-ldap (0.17.0) netrc (0.11.0) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.13.4-x64-mingw-ucrt) + racc (~> 1.4) origen_debuggers (0.6.1) origen (>= 0.2.6) origen_testers (>= 0.5.0) - origen_doc_helpers (0.8.3) + origen_doc_helpers (0.8.6) origen (>= 0.7.15) origen_jtag (0.22.1) origen (~> 0.7, >= 0.7.35) @@ -146,52 +141,58 @@ GEM ast (~> 2) origen (>= 0.41.0) treetop - parser (2.7.2.0) + parallel (1.22.1) + parser (3.1.2.0) ast (~> 2.4.1) polyglot (0.3.5) - powerpack (0.1.3) pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) - rainbow (2.2.2) - rake + racc (1.6.0) + rainbow (3.1.1) rake (10.5.0) + regexp_parser (2.3.0) require_all (1.5.0) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) + rexml (3.2.5) ripper-tags (0.9.0) - rodf (1.1.1) + rodf (1.2.0) builder (>= 3.0) - dry-inflector (~> 0.1) rubyzip (>= 1.0) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) + rspec-support (~> 3.11.0) rspec-legacy_formatters (1.0.2) rspec (~> 3.0) - rspec-mocks (3.10.2) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.3) - rubocop (0.30.0) - astrolabe (~> 1.3) - parser (>= 2.2.0.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.4) + rspec-support (~> 3.11.0) + rspec-support (3.11.0) + rubocop (1.28.1) + parallel (~> 1.10) + parser (>= 3.1.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.17.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.17.0) + parser (>= 3.1.1.0) ruby-progressbar (1.11.0) - rubyzip (2.3.0) + rubyzip (2.3.2) scrub_rb (1.0.1) - sexpistol (0.0.7) + sexpistol (0.1.2) simplecov (0.17.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -202,7 +203,7 @@ GEM tins (~> 1.0) thor (0.20.3) thread_safe (0.3.6) - tins (1.26.0) + tins (1.31.0) sync treetop (1.6.11) polyglot (~> 0.3) @@ -210,17 +211,20 @@ GEM thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - yard (0.9.26) + unf_ext (0.0.8.1) + unicode-display_width (2.1.0) + webrick (1.7.0) + yard (0.9.27) + webrick (~> 1.7.0) PLATFORMS - ruby + x64-mingw-ucrt DEPENDENCIES byebug (~> 10) coveralls loco - nokogiri (= 1.10.10) + nokogiri origen! origen_app_generators! origen_core_support! @@ -232,4 +236,4 @@ DEPENDENCIES ripper-tags BUNDLED WITH - 2.1.4 + 2.3.7 diff --git a/lib/origen/pins.rb b/lib/origen/pins.rb index 3a416648..ffbf163b 100755 --- a/lib/origen/pins.rb +++ b/lib/origen/pins.rb @@ -693,7 +693,13 @@ def virtual_pin_groups(id = nil, options = {}, &_block) end alias_method :virtual_pin_group, :virtual_pin_groups - def all_pin_ids(type: nil, **options) + def all_pin_ids(*options) + type = nil + if options.first.is_a?(Hash) + options = options.first + type = options[:type] + end + case type when :power_pin, :power_pins dut.pins(power_pin: true).map { |n, p| [n, *p.aliases.keys] }.flatten.map { |n| [n, dut.power_pin(n)] }.to_h diff --git a/lib/origen/pins/pin.rb b/lib/origen/pins/pin.rb index 42925b0c..9cf6b65c 100755 --- a/lib/origen/pins/pin.rb +++ b/lib/origen/pins/pin.rb @@ -1090,11 +1090,12 @@ def ext_pulldown=(value) end end - def index?(context: nil) - !!index(context: context).nil? + def index?(options = { context: nil }) + !!index(options).nil? end - def index(context: nil) + def index(options = { context: nil }) + context = options[:context] if context.is_a?(Symbol) # Context pin group provided group = groups[context].instance_variable_get(:@store) @@ -1114,7 +1115,8 @@ def index(context: nil) end end - def mask(context: nil) + def mask(options = { context: nil }) + context = options[:context] index = context.is_a?(Integer) ? context : self.index(context: context) if index.nil? && context.nil? @@ -1130,7 +1132,10 @@ def mask(context: nil) alias_method :set_mask, :mask alias_method :smask, :mask - def clear_mask(context: nil, size: nil) + def clear_mask(options = { context: nil, size: nil }) + context = options[:context] + size = options[:size] + index = context.is_a?(Integer) ? context : self.index(context: context) if index.nil? && context.nil? diff --git a/lib/origen/version_string.rb b/lib/origen/version_string.rb index 0085a6f5..5e7780c7 100755 --- a/lib/origen/version_string.rb +++ b/lib/origen/version_string.rb @@ -186,7 +186,7 @@ def pre alias_method :dev, :pre def latest? - downcase.orig_equal?('trunk') || downcase.orig_equal?('latest') + downcase.to_s.eql?('trunk') || downcase.to_s.eql?('latest') end # Returns true if the version is a timestamp format version number diff --git a/origen.gemspec b/origen.gemspec index 7970f4e7..cd625f36 100644 --- a/origen.gemspec +++ b/origen.gemspec @@ -38,7 +38,8 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "thor", "~>0.19" spec.add_runtime_dependency "nanoc", "~>3.7.0" spec.add_runtime_dependency "kramdown", "~>1.5" - spec.add_runtime_dependency "rubocop", "0.30" + # spec.add_runtime_dependency "rubocop", "0.30" + spec.add_runtime_dependency "rubocop" spec.add_runtime_dependency "coderay", "~>1.1" spec.add_runtime_dependency "rake", "~>10" spec.add_runtime_dependency "pry", "~>0.10" @@ -50,7 +51,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "highline", "~>1.7" spec.add_runtime_dependency "dentaku", "~>3" spec.add_runtime_dependency "colorize", "~> 0.8.1" - spec.add_runtime_dependency 'nokogiri', '>= 1.7.2' - spec.add_runtime_dependency 'cri', '~>2.10.0' # Not required by Origen, but add constrain to avoid Ruby 2.3 requirement + spec.add_runtime_dependency 'nokogiri', '>= 1.11.0' + #spec.add_runtime_dependency 'cri', '~>2.10.0' # Not required by Origen, but add constrain to avoid Ruby 2.3 requirement spec.add_runtime_dependency 'concurrent-ruby' end From 58a6def9d2b83db82fb5165798c9de37e25b9d56 Mon Sep 17 00:00:00 2001 From: Priyavadan Kumar Date: Thu, 21 Apr 2022 15:34:24 -0500 Subject: [PATCH 02/40] tested with ruby 3.0.2 --- Gemfile.lock | 35 +++++++++++++++-------------------- lib/origen/pins.rb | 10 +++++----- lib/origen/pins/pin.rb | 10 +++++----- origen.gemspec | 4 ++-- 4 files changed, 27 insertions(+), 32 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index dcf04d3b..eda3a30a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,7 +60,7 @@ PATH rake (~> 10) rspec (~> 3) rspec-legacy_formatters (~> 1) - rubocop + rubocop (= 0.30) scrub_rb (~> 1.0) simplecov (~> 0.17) simplecov-html (~> 0.10) @@ -76,6 +76,8 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) ast (2.4.2) + astrolabe (1.3.1) + parser (~> 2.2) atp (1.1.3) ast (~> 2) origen (>= 0.2.3) @@ -123,7 +125,7 @@ GEM cri (~> 2.3) net-ldap (0.17.0) netrc (0.11.0) - nokogiri (1.13.4-x64-mingw-ucrt) + nokogiri (1.13.4-x86_64-linux) racc (~> 1.4) origen_debuggers (0.6.1) origen (>= 0.2.6) @@ -141,24 +143,23 @@ GEM ast (~> 2) origen (>= 0.41.0) treetop - parallel (1.22.1) - parser (3.1.2.0) + parser (2.7.2.0) ast (~> 2.4.1) polyglot (0.3.5) + powerpack (0.1.3) pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) racc (1.6.0) - rainbow (3.1.1) + rainbow (2.2.2) + rake rake (10.5.0) - regexp_parser (2.3.0) require_all (1.5.0) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) ripper-tags (0.9.0) rodf (1.2.0) builder (>= 3.0) @@ -178,17 +179,12 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-support (3.11.0) - rubocop (1.28.1) - parallel (~> 1.10) - parser (>= 3.1.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.17.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.17.0) - parser (>= 3.1.1.0) + rubocop (0.30.0) + astrolabe (~> 1.3) + parser (>= 2.2.0.1, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.4) ruby-progressbar (1.11.0) rubyzip (2.3.2) scrub_rb (1.0.1) @@ -212,13 +208,12 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.1) - unicode-display_width (2.1.0) webrick (1.7.0) yard (0.9.27) webrick (~> 1.7.0) PLATFORMS - x64-mingw-ucrt + x86_64-linux DEPENDENCIES byebug (~> 10) diff --git a/lib/origen/pins.rb b/lib/origen/pins.rb index ffbf163b..fe17ea7a 100755 --- a/lib/origen/pins.rb +++ b/lib/origen/pins.rb @@ -694,12 +694,12 @@ def virtual_pin_groups(id = nil, options = {}, &_block) alias_method :virtual_pin_group, :virtual_pin_groups def all_pin_ids(*options) - type = nil - if options.first.is_a?(Hash) - options = options.first - type = options[:type] + type = nil + if options.first.is_a?(Hash) + options = options.first + type = options[:type] end - + case type when :power_pin, :power_pins dut.pins(power_pin: true).map { |n, p| [n, *p.aliases.keys] }.flatten.map { |n| [n, dut.power_pin(n)] }.to_h diff --git a/lib/origen/pins/pin.rb b/lib/origen/pins/pin.rb index 9cf6b65c..19923a56 100755 --- a/lib/origen/pins/pin.rb +++ b/lib/origen/pins/pin.rb @@ -1095,7 +1095,7 @@ def index?(options = { context: nil }) end def index(options = { context: nil }) - context = options[:context] + context = options[:context] if context.is_a?(Symbol) # Context pin group provided group = groups[context].instance_variable_get(:@store) @@ -1116,7 +1116,7 @@ def index(options = { context: nil }) end def mask(options = { context: nil }) - context = options[:context] + context = options[:context] index = context.is_a?(Integer) ? context : self.index(context: context) if index.nil? && context.nil? @@ -1133,9 +1133,9 @@ def mask(options = { context: nil }) alias_method :smask, :mask def clear_mask(options = { context: nil, size: nil }) - context = options[:context] - size = options[:size] - + context = options[:context] + size = options[:size] + index = context.is_a?(Integer) ? context : self.index(context: context) if index.nil? && context.nil? diff --git a/origen.gemspec b/origen.gemspec index cd625f36..2a68126e 100644 --- a/origen.gemspec +++ b/origen.gemspec @@ -38,8 +38,8 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "thor", "~>0.19" spec.add_runtime_dependency "nanoc", "~>3.7.0" spec.add_runtime_dependency "kramdown", "~>1.5" - # spec.add_runtime_dependency "rubocop", "0.30" - spec.add_runtime_dependency "rubocop" + spec.add_runtime_dependency "rubocop", "0.30" + # spec.add_runtime_dependency "rubocop" spec.add_runtime_dependency "coderay", "~>1.1" spec.add_runtime_dependency "rake", "~>10" spec.add_runtime_dependency "pry", "~>0.10" From 547a4b82e1022ecd40c14a43df4c07be43ba2140 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Thu, 21 Apr 2022 17:32:16 -0700 Subject: [PATCH 03/40] remove Gemfile.lock to avoid bundler errors --- .github/workflows/regression_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 5572183c..813cd0de 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -20,6 +20,7 @@ jobs: - name: Install Bundler run: gem install bundler -v '> 2' - name: Install dependencies + run: rm Gemfile.lock run: bundle install - name: Gem Install Origen run: gem install origen From cbd0ab3ea5a8cec4f77831855df861d7737cc3c9 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Thu, 21 Apr 2022 17:36:49 -0700 Subject: [PATCH 04/40] try again to remove gemfile.lock --- .github/workflows/regression_tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 813cd0de..aa661713 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -19,8 +19,9 @@ jobs: run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV - name: Install Bundler run: gem install bundler -v '> 2' - - name: Install dependencies + - name: Remove Gemfile.lock run: rm Gemfile.lock + - name: Install dependencies run: bundle install - name: Gem Install Origen run: gem install origen From bb510bc963e99782517b397617300d30a5c3b4ee Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Thu, 21 Apr 2022 17:39:36 -0700 Subject: [PATCH 05/40] use supported ruby setup --- .github/workflows/regression_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index aa661713..02a9089a 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} - name: Update Env From e0dd16c44790fb217d87aa7a46659fabb841178c Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Thu, 21 Apr 2022 17:52:21 -0700 Subject: [PATCH 06/40] doc_helpers broken again for windows GA, disable for now --- .github/workflows/regression_tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 02a9089a..9f2df41e 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -4,8 +4,9 @@ jobs: build: strategy: matrix: - os: [ubuntu-latest, windows-latest] - ruby-version: [2.5, 2.6, 2.7] +# os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest] + ruby-version: [2.5, 2.6, 2.7, 3.0, 3.1] runs-on: ${{ matrix.os }} From 3b903c0a2e22a51ee300ddfcfbf43453f702e39f Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Thu, 21 Apr 2022 17:55:25 -0700 Subject: [PATCH 07/40] GA setup not working with ruby 3 --- .github/workflows/regression_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 9f2df41e..f792b232 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [ubuntu-latest] - ruby-version: [2.5, 2.6, 2.7, 3.0, 3.1] + ruby-version: [2.5, 2.6, 2.7] runs-on: ${{ matrix.os }} From 3fde4078078204a1469eb82fd48ad63b78fd74de Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 23 Apr 2022 08:41:08 -0500 Subject: [PATCH 08/40] to see what happens --- .github/workflows/regression_tests.yml | 4 +- Gemfile.lock | 234 ------------------------- 2 files changed, 1 insertion(+), 237 deletions(-) delete mode 100644 Gemfile.lock diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index f792b232..9959bde1 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [ubuntu-latest] - ruby-version: [2.5, 2.6, 2.7] + ruby-version: [2.5, 2.6, 2.7, 3.0, 3.1] runs-on: ${{ matrix.os }} @@ -20,8 +20,6 @@ jobs: run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV - name: Install Bundler run: gem install bundler -v '> 2' - - name: Remove Gemfile.lock - run: rm Gemfile.lock - name: Install dependencies run: bundle install - name: Gem Install Origen diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index eda3a30a..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,234 +0,0 @@ -GIT - remote: https://github.com/Origen-SDK/origen_app_generators.git - revision: 5ba9d89528513a3872f8bb6f32997cb9c4c37cd4 - specs: - origen_app_generators (2.2.0) - origen (>= 0.40.2) - -GIT - remote: https://github.com/Origen-SDK/origen_core_support.git - revision: c300af1ad9aedea3ac75368d3f134eaafc3a09ec - specs: - origen_core_support (0.2.3) - origen (>= 0.2.6) - origen_testers - -GIT - remote: https://github.com/Origen-SDK/origen_sim.git - revision: a3fb3e32bad2873a8234d1517f604c21f30fa31d - specs: - origen_sim (0.20.7) - origen (>= 0.44.0) - origen_testers (>= 0.21.0) - origen_verilog (>= 0.6.2) - -GIT - remote: https://github.com/Origen-SDK/origen_testers.git - revision: 48cd797b5003cebe02bbae6175a1e3ca9bb6aa1f - specs: - origen_testers (0.49.4) - ast (~> 2) - atp (~> 1.1, >= 1.1.3) - dentaku (~> 3) - origen (>= 0.57.1) - origen_stil (>= 0.2.1) - require_all (~> 1) - rodf (~> 1) - sexpistol (~> 0.0) - simplecov (~> 0.17) - simplecov-html (~> 0.10.0) - -PATH - remote: . - specs: - origen (0.60.7) - activesupport (~> 4.1) - bundler (> 1.7) - coderay (~> 1.1) - colored (~> 1.2) - colorize (~> 0.8.1) - concurrent-ruby - dentaku (~> 3) - gems (~> 0.8) - highline (~> 1.7) - httparty (~> 0.13) - kramdown (~> 1.5) - nanoc (~> 3.7.0) - net-ldap (~> 0.13) - nokogiri (>= 1.11.0) - pry (~> 0.10) - rake (~> 10) - rspec (~> 3) - rspec-legacy_formatters (~> 1) - rubocop (= 0.30) - scrub_rb (~> 1.0) - simplecov (~> 0.17) - simplecov-html (~> 0.10) - thor (~> 0.19) - yard (~> 0.8) - -GEM - remote: https://rubygems.org/ - specs: - activesupport (4.2.11.3) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - ast (2.4.2) - astrolabe (1.3.1) - parser (~> 2.2) - atp (1.1.3) - ast (~> 2) - origen (>= 0.2.3) - sexpistol (~> 0.0) - builder (3.2.4) - byebug (10.0.2) - coderay (1.1.3) - colored (1.2) - colorize (0.8.1) - concurrent-ruby (1.1.10) - coveralls (0.7.1) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - cri (2.15.11) - dentaku (3.5.0) - concurrent-ruby - diff-lcs (1.5.0) - docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - gems (0.8.3) - highline (1.7.10) - http-accept (1.7.0) - http-cookie (1.0.4) - domain_name (~> 0.5) - httparty (0.20.0) - mime-types (~> 3.0) - multi_xml (>= 0.5.2) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - json (2.6.1) - kramdown (1.17.0) - loco (0.0.7) - method_source (1.0.0) - mime-types (3.4.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - minitest (5.15.0) - multi_json (1.15.0) - multi_xml (0.6.0) - nanoc (3.7.5) - cri (~> 2.3) - net-ldap (0.17.0) - netrc (0.11.0) - nokogiri (1.13.4-x86_64-linux) - racc (~> 1.4) - origen_debuggers (0.6.1) - origen (>= 0.2.6) - origen_testers (>= 0.5.0) - origen_doc_helpers (0.8.6) - origen (>= 0.7.15) - origen_jtag (0.22.1) - origen (~> 0.7, >= 0.7.35) - origen_testers (>= 0.13.2) - origen_stil (0.3.0) - ast (~> 2) - origen (>= 0.33.3) - treetop - origen_verilog (0.6.3) - ast (~> 2) - origen (>= 0.41.0) - treetop - parser (2.7.2.0) - ast (~> 2.4.1) - polyglot (0.3.5) - powerpack (0.1.3) - pry (0.14.1) - coderay (~> 1.1) - method_source (~> 1.0) - racc (1.6.0) - rainbow (2.2.2) - rake - rake (10.5.0) - require_all (1.5.0) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - ripper-tags (0.9.0) - rodf (1.2.0) - builder (>= 3.0) - rubyzip (>= 1.0) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-legacy_formatters (1.0.2) - rspec (~> 3.0) - rspec-mocks (3.11.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - rubocop (0.30.0) - astrolabe (~> 1.3) - parser (>= 2.2.0.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.4) - ruby-progressbar (1.11.0) - rubyzip (2.3.2) - scrub_rb (1.0.1) - sexpistol (0.1.2) - simplecov (0.17.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - sync (0.5.0) - term-ansicolor (1.7.1) - tins (~> 1.0) - thor (0.20.3) - thread_safe (0.3.6) - tins (1.31.0) - sync - treetop (1.6.11) - polyglot (~> 0.3) - tzinfo (1.2.9) - thread_safe (~> 0.1) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.1) - webrick (1.7.0) - yard (0.9.27) - webrick (~> 1.7.0) - -PLATFORMS - x86_64-linux - -DEPENDENCIES - byebug (~> 10) - coveralls - loco - nokogiri - origen! - origen_app_generators! - origen_core_support! - origen_debuggers (~> 0) - origen_doc_helpers - origen_jtag - origen_sim! - origen_testers! - ripper-tags - -BUNDLED WITH - 2.3.7 From ca8985dbd249aeef0af1326bd2468a982c5d19ba Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 23 Apr 2022 08:46:56 -0500 Subject: [PATCH 09/40] try with whatever bundler version --- .github/workflows/regression_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 9959bde1..a356cd44 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -18,8 +18,8 @@ jobs: ruby-version: ${{ matrix.ruby-version }} - name: Update Env run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV - - name: Install Bundler - run: gem install bundler -v '> 2' +# - name: Install Bundler +# run: gem install bundler -v '> 2' - name: Install dependencies run: bundle install - name: Gem Install Origen From 877bd2b989a108fc0cded191b4ae00bac0843c15 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 23 Apr 2022 08:52:15 -0500 Subject: [PATCH 10/40] try to get a non-ancient origen version to install --- .github/workflows/regression_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index a356cd44..1e05b1b0 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -20,10 +20,10 @@ jobs: run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV # - name: Install Bundler # run: gem install bundler -v '> 2' + - name: Gem Install Origen + run: gem install origen --version 0.60.7 - name: Install dependencies run: bundle install - - name: Gem Install Origen - run: gem install origen - name: Setup Dependencies run: origen -v - name: Run Origen Lint From 898ae8073e0456adba9a80227da3c10bd4f2dd58 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 23 Apr 2022 08:55:46 -0500 Subject: [PATCH 11/40] install bundler --- .github/workflows/regression_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 1e05b1b0..bafe9a4e 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -18,8 +18,8 @@ jobs: ruby-version: ${{ matrix.ruby-version }} - name: Update Env run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV -# - name: Install Bundler -# run: gem install bundler -v '> 2' + - name: Install Bundler + run: gem install bundler -v '> 2' - name: Gem Install Origen run: gem install origen --version 0.60.7 - name: Install dependencies From 8b5d1a8b4f8d52a7fee16611b48c9bf1744a0d0d Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 23 Apr 2022 08:57:32 -0500 Subject: [PATCH 12/40] think a merge release is needed first --- .github/workflows/regression_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index bafe9a4e..d73c1324 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [ubuntu-latest] - ruby-version: [2.5, 2.6, 2.7, 3.0, 3.1] + ruby-version: [2.5, 2.6, 2.7] runs-on: ${{ matrix.os }} From 2b2533dc422edc47592df78d0c2666ff5f94dfb7 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 23 Apr 2022 09:04:08 -0500 Subject: [PATCH 13/40] revert debug changes --- .github/workflows/regression_tests.yml | 6 +- Gemfile.lock | 234 +++++++++++++++++++++++++ 2 files changed, 237 insertions(+), 3 deletions(-) create mode 100644 Gemfile.lock diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index d73c1324..9b7454b2 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -20,10 +20,10 @@ jobs: run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV - name: Install Bundler run: gem install bundler -v '> 2' - - name: Gem Install Origen - run: gem install origen --version 0.60.7 - name: Install dependencies run: bundle install + - name: Gem Install Origen + run: gem install origen - name: Setup Dependencies run: origen -v - name: Run Origen Lint @@ -33,4 +33,4 @@ jobs: - name: Run Spec tests run: origen test -c - name: Verify Building website - run: origen web compile --no-serve + run: origen web compile --no-serve \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..8d1fe8f7 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,234 @@ +GIT + remote: https://github.com/Origen-SDK/origen_app_generators.git + revision: 5ba9d89528513a3872f8bb6f32997cb9c4c37cd4 + specs: + origen_app_generators (2.2.0) + origen (>= 0.40.2) + +GIT + remote: https://github.com/Origen-SDK/origen_core_support.git + revision: c300af1ad9aedea3ac75368d3f134eaafc3a09ec + specs: + origen_core_support (0.2.3) + origen (>= 0.2.6) + origen_testers + +GIT + remote: https://github.com/Origen-SDK/origen_sim.git + revision: a3fb3e32bad2873a8234d1517f604c21f30fa31d + specs: + origen_sim (0.20.7) + origen (>= 0.44.0) + origen_testers (>= 0.21.0) + origen_verilog (>= 0.6.2) + +GIT + remote: https://github.com/Origen-SDK/origen_testers.git + revision: 48cd797b5003cebe02bbae6175a1e3ca9bb6aa1f + specs: + origen_testers (0.49.4) + ast (~> 2) + atp (~> 1.1, >= 1.1.3) + dentaku (~> 3) + origen (>= 0.57.1) + origen_stil (>= 0.2.1) + require_all (~> 1) + rodf (~> 1) + sexpistol (~> 0.0) + simplecov (~> 0.17) + simplecov-html (~> 0.10.0) + +PATH + remote: . + specs: + origen (0.60.7) + activesupport (~> 4.1) + bundler (> 1.7) + coderay (~> 1.1) + colored (~> 1.2) + colorize (~> 0.8.1) + concurrent-ruby + dentaku (~> 3) + gems (~> 0.8) + highline (~> 1.7) + httparty (~> 0.13) + kramdown (~> 1.5) + nanoc (~> 3.7.0) + net-ldap (~> 0.13) + nokogiri (>= 1.11.0) + pry (~> 0.10) + rake (~> 10) + rspec (~> 3) + rspec-legacy_formatters (~> 1) + rubocop (= 0.30) + scrub_rb (~> 1.0) + simplecov (~> 0.17) + simplecov-html (~> 0.10) + thor (~> 0.19) + yard (~> 0.8) + +GEM + remote: https://rubygems.org/ + specs: + activesupport (4.2.11.3) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + ast (2.4.2) + astrolabe (1.3.1) + parser (~> 2.2) + atp (1.1.3) + ast (~> 2) + origen (>= 0.2.3) + sexpistol (~> 0.0) + builder (3.2.4) + byebug (10.0.2) + coderay (1.1.3) + colored (1.2) + colorize (0.8.1) + concurrent-ruby (1.1.10) + coveralls (0.7.1) + multi_json (~> 1.3) + rest-client + simplecov (>= 0.7) + term-ansicolor + thor + cri (2.15.11) + dentaku (3.5.0) + concurrent-ruby + diff-lcs (1.5.0) + docile (1.4.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + gems (0.8.3) + highline (1.7.10) + http-accept (1.7.0) + http-cookie (1.0.4) + domain_name (~> 0.5) + httparty (0.20.0) + mime-types (~> 3.0) + multi_xml (>= 0.5.2) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.6.1) + kramdown (1.17.0) + loco (0.0.7) + method_source (1.0.0) + mime-types (3.4.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2022.0105) + minitest (5.15.0) + multi_json (1.15.0) + multi_xml (0.6.0) + nanoc (3.7.5) + cri (~> 2.3) + net-ldap (0.17.0) + netrc (0.11.0) + nokogiri (1.13.4-x86_64-linux) + racc (~> 1.4) + origen_debuggers (0.6.1) + origen (>= 0.2.6) + origen_testers (>= 0.5.0) + origen_doc_helpers (0.8.6) + origen (>= 0.7.15) + origen_jtag (0.22.1) + origen (~> 0.7, >= 0.7.35) + origen_testers (>= 0.13.2) + origen_stil (0.3.0) + ast (~> 2) + origen (>= 0.33.3) + treetop + origen_verilog (0.6.3) + ast (~> 2) + origen (>= 0.41.0) + treetop + parser (2.7.2.0) + ast (~> 2.4.1) + polyglot (0.3.5) + powerpack (0.1.3) + pry (0.14.1) + coderay (~> 1.1) + method_source (~> 1.0) + racc (1.6.0) + rainbow (2.2.2) + rake + rake (10.5.0) + require_all (1.5.0) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + ripper-tags (0.9.0) + rodf (1.2.0) + builder (>= 3.0) + rubyzip (>= 1.0) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-legacy_formatters (1.0.2) + rspec (~> 3.0) + rspec-mocks (3.11.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-support (3.11.0) + rubocop (0.30.0) + astrolabe (~> 1.3) + parser (>= 2.2.0.1, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.4) + ruby-progressbar (1.11.0) + rubyzip (2.3.2) + scrub_rb (1.0.1) + sexpistol (0.1.2) + simplecov (0.17.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sync (0.5.0) + term-ansicolor (1.7.1) + tins (~> 1.0) + thor (0.20.3) + thread_safe (0.3.6) + tins (1.31.0) + sync + treetop (1.6.11) + polyglot (~> 0.3) + tzinfo (1.2.9) + thread_safe (~> 0.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.1) + webrick (1.7.0) + yard (0.9.27) + webrick (~> 1.7.0) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + byebug (~> 10) + coveralls + loco + nokogiri + origen! + origen_app_generators! + origen_core_support! + origen_debuggers (~> 0) + origen_doc_helpers + origen_jtag + origen_sim! + origen_testers! + ripper-tags + +BUNDLED WITH + 2.3.7 \ No newline at end of file From 3cc830a51524862d30966aa5ee360f381d0f79a7 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 23 Apr 2022 09:16:08 -0500 Subject: [PATCH 14/40] Revert "revert debug changes" This reverts commit 2b2533dc422edc47592df78d0c2666ff5f94dfb7. --- .github/workflows/regression_tests.yml | 6 +- Gemfile.lock | 234 ------------------------- 2 files changed, 3 insertions(+), 237 deletions(-) delete mode 100644 Gemfile.lock diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 9b7454b2..d73c1324 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -20,10 +20,10 @@ jobs: run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV - name: Install Bundler run: gem install bundler -v '> 2' + - name: Gem Install Origen + run: gem install origen --version 0.60.7 - name: Install dependencies run: bundle install - - name: Gem Install Origen - run: gem install origen - name: Setup Dependencies run: origen -v - name: Run Origen Lint @@ -33,4 +33,4 @@ jobs: - name: Run Spec tests run: origen test -c - name: Verify Building website - run: origen web compile --no-serve \ No newline at end of file + run: origen web compile --no-serve diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 8d1fe8f7..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,234 +0,0 @@ -GIT - remote: https://github.com/Origen-SDK/origen_app_generators.git - revision: 5ba9d89528513a3872f8bb6f32997cb9c4c37cd4 - specs: - origen_app_generators (2.2.0) - origen (>= 0.40.2) - -GIT - remote: https://github.com/Origen-SDK/origen_core_support.git - revision: c300af1ad9aedea3ac75368d3f134eaafc3a09ec - specs: - origen_core_support (0.2.3) - origen (>= 0.2.6) - origen_testers - -GIT - remote: https://github.com/Origen-SDK/origen_sim.git - revision: a3fb3e32bad2873a8234d1517f604c21f30fa31d - specs: - origen_sim (0.20.7) - origen (>= 0.44.0) - origen_testers (>= 0.21.0) - origen_verilog (>= 0.6.2) - -GIT - remote: https://github.com/Origen-SDK/origen_testers.git - revision: 48cd797b5003cebe02bbae6175a1e3ca9bb6aa1f - specs: - origen_testers (0.49.4) - ast (~> 2) - atp (~> 1.1, >= 1.1.3) - dentaku (~> 3) - origen (>= 0.57.1) - origen_stil (>= 0.2.1) - require_all (~> 1) - rodf (~> 1) - sexpistol (~> 0.0) - simplecov (~> 0.17) - simplecov-html (~> 0.10.0) - -PATH - remote: . - specs: - origen (0.60.7) - activesupport (~> 4.1) - bundler (> 1.7) - coderay (~> 1.1) - colored (~> 1.2) - colorize (~> 0.8.1) - concurrent-ruby - dentaku (~> 3) - gems (~> 0.8) - highline (~> 1.7) - httparty (~> 0.13) - kramdown (~> 1.5) - nanoc (~> 3.7.0) - net-ldap (~> 0.13) - nokogiri (>= 1.11.0) - pry (~> 0.10) - rake (~> 10) - rspec (~> 3) - rspec-legacy_formatters (~> 1) - rubocop (= 0.30) - scrub_rb (~> 1.0) - simplecov (~> 0.17) - simplecov-html (~> 0.10) - thor (~> 0.19) - yard (~> 0.8) - -GEM - remote: https://rubygems.org/ - specs: - activesupport (4.2.11.3) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - ast (2.4.2) - astrolabe (1.3.1) - parser (~> 2.2) - atp (1.1.3) - ast (~> 2) - origen (>= 0.2.3) - sexpistol (~> 0.0) - builder (3.2.4) - byebug (10.0.2) - coderay (1.1.3) - colored (1.2) - colorize (0.8.1) - concurrent-ruby (1.1.10) - coveralls (0.7.1) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - cri (2.15.11) - dentaku (3.5.0) - concurrent-ruby - diff-lcs (1.5.0) - docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - gems (0.8.3) - highline (1.7.10) - http-accept (1.7.0) - http-cookie (1.0.4) - domain_name (~> 0.5) - httparty (0.20.0) - mime-types (~> 3.0) - multi_xml (>= 0.5.2) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - json (2.6.1) - kramdown (1.17.0) - loco (0.0.7) - method_source (1.0.0) - mime-types (3.4.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - minitest (5.15.0) - multi_json (1.15.0) - multi_xml (0.6.0) - nanoc (3.7.5) - cri (~> 2.3) - net-ldap (0.17.0) - netrc (0.11.0) - nokogiri (1.13.4-x86_64-linux) - racc (~> 1.4) - origen_debuggers (0.6.1) - origen (>= 0.2.6) - origen_testers (>= 0.5.0) - origen_doc_helpers (0.8.6) - origen (>= 0.7.15) - origen_jtag (0.22.1) - origen (~> 0.7, >= 0.7.35) - origen_testers (>= 0.13.2) - origen_stil (0.3.0) - ast (~> 2) - origen (>= 0.33.3) - treetop - origen_verilog (0.6.3) - ast (~> 2) - origen (>= 0.41.0) - treetop - parser (2.7.2.0) - ast (~> 2.4.1) - polyglot (0.3.5) - powerpack (0.1.3) - pry (0.14.1) - coderay (~> 1.1) - method_source (~> 1.0) - racc (1.6.0) - rainbow (2.2.2) - rake - rake (10.5.0) - require_all (1.5.0) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - ripper-tags (0.9.0) - rodf (1.2.0) - builder (>= 3.0) - rubyzip (>= 1.0) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-legacy_formatters (1.0.2) - rspec (~> 3.0) - rspec-mocks (3.11.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - rubocop (0.30.0) - astrolabe (~> 1.3) - parser (>= 2.2.0.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.4) - ruby-progressbar (1.11.0) - rubyzip (2.3.2) - scrub_rb (1.0.1) - sexpistol (0.1.2) - simplecov (0.17.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - sync (0.5.0) - term-ansicolor (1.7.1) - tins (~> 1.0) - thor (0.20.3) - thread_safe (0.3.6) - tins (1.31.0) - sync - treetop (1.6.11) - polyglot (~> 0.3) - tzinfo (1.2.9) - thread_safe (~> 0.1) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.1) - webrick (1.7.0) - yard (0.9.27) - webrick (~> 1.7.0) - -PLATFORMS - x86_64-linux - -DEPENDENCIES - byebug (~> 10) - coveralls - loco - nokogiri - origen! - origen_app_generators! - origen_core_support! - origen_debuggers (~> 0) - origen_doc_helpers - origen_jtag - origen_sim! - origen_testers! - ripper-tags - -BUNDLED WITH - 2.3.7 \ No newline at end of file From b07d7e0eef4663ed23d1c311897c321c975d34c5 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 23 Apr 2022 09:16:16 -0500 Subject: [PATCH 15/40] Revert "think a merge release is needed first" This reverts commit 8b5d1a8b4f8d52a7fee16611b48c9bf1744a0d0d. --- .github/workflows/regression_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index d73c1324..bafe9a4e 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [ubuntu-latest] - ruby-version: [2.5, 2.6, 2.7] + ruby-version: [2.5, 2.6, 2.7, 3.0, 3.1] runs-on: ${{ matrix.os }} From 054a4a4ca9ea53f92ff15d1428f455dce68cebfc Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 23 Apr 2022 09:16:20 -0500 Subject: [PATCH 16/40] Revert "install bundler" This reverts commit 898ae8073e0456adba9a80227da3c10bd4f2dd58. --- .github/workflows/regression_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index bafe9a4e..1e05b1b0 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -18,8 +18,8 @@ jobs: ruby-version: ${{ matrix.ruby-version }} - name: Update Env run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV - - name: Install Bundler - run: gem install bundler -v '> 2' +# - name: Install Bundler +# run: gem install bundler -v '> 2' - name: Gem Install Origen run: gem install origen --version 0.60.7 - name: Install dependencies From b76e9b6fdaab8b7a335a0a5af12efe7a59c10528 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 23 Apr 2022 09:16:22 -0500 Subject: [PATCH 17/40] Revert "try to get a non-ancient origen version to install" This reverts commit 877bd2b989a108fc0cded191b4ae00bac0843c15. --- .github/workflows/regression_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 1e05b1b0..a356cd44 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -20,10 +20,10 @@ jobs: run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV # - name: Install Bundler # run: gem install bundler -v '> 2' - - name: Gem Install Origen - run: gem install origen --version 0.60.7 - name: Install dependencies run: bundle install + - name: Gem Install Origen + run: gem install origen - name: Setup Dependencies run: origen -v - name: Run Origen Lint From c5c354d41a58ac9018c15d6b69aaacf688335ff6 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 23 Apr 2022 09:16:24 -0500 Subject: [PATCH 18/40] Revert "try with whatever bundler version" This reverts commit ca8985dbd249aeef0af1326bd2468a982c5d19ba. --- .github/workflows/regression_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index a356cd44..9959bde1 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -18,8 +18,8 @@ jobs: ruby-version: ${{ matrix.ruby-version }} - name: Update Env run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV -# - name: Install Bundler -# run: gem install bundler -v '> 2' + - name: Install Bundler + run: gem install bundler -v '> 2' - name: Install dependencies run: bundle install - name: Gem Install Origen From c05c4813459f4625dae032f68942b28744a0603c Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 23 Apr 2022 09:19:35 -0500 Subject: [PATCH 19/40] Revert "to see what happens" This reverts commit 3fde4078078204a1469eb82fd48ad63b78fd74de. --- .github/workflows/regression_tests.yml | 4 +- Gemfile.lock | 234 +++++++++++++++++++++++++ 2 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 Gemfile.lock diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 9959bde1..f792b232 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [ubuntu-latest] - ruby-version: [2.5, 2.6, 2.7, 3.0, 3.1] + ruby-version: [2.5, 2.6, 2.7] runs-on: ${{ matrix.os }} @@ -20,6 +20,8 @@ jobs: run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV - name: Install Bundler run: gem install bundler -v '> 2' + - name: Remove Gemfile.lock + run: rm Gemfile.lock - name: Install dependencies run: bundle install - name: Gem Install Origen diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..eda3a30a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,234 @@ +GIT + remote: https://github.com/Origen-SDK/origen_app_generators.git + revision: 5ba9d89528513a3872f8bb6f32997cb9c4c37cd4 + specs: + origen_app_generators (2.2.0) + origen (>= 0.40.2) + +GIT + remote: https://github.com/Origen-SDK/origen_core_support.git + revision: c300af1ad9aedea3ac75368d3f134eaafc3a09ec + specs: + origen_core_support (0.2.3) + origen (>= 0.2.6) + origen_testers + +GIT + remote: https://github.com/Origen-SDK/origen_sim.git + revision: a3fb3e32bad2873a8234d1517f604c21f30fa31d + specs: + origen_sim (0.20.7) + origen (>= 0.44.0) + origen_testers (>= 0.21.0) + origen_verilog (>= 0.6.2) + +GIT + remote: https://github.com/Origen-SDK/origen_testers.git + revision: 48cd797b5003cebe02bbae6175a1e3ca9bb6aa1f + specs: + origen_testers (0.49.4) + ast (~> 2) + atp (~> 1.1, >= 1.1.3) + dentaku (~> 3) + origen (>= 0.57.1) + origen_stil (>= 0.2.1) + require_all (~> 1) + rodf (~> 1) + sexpistol (~> 0.0) + simplecov (~> 0.17) + simplecov-html (~> 0.10.0) + +PATH + remote: . + specs: + origen (0.60.7) + activesupport (~> 4.1) + bundler (> 1.7) + coderay (~> 1.1) + colored (~> 1.2) + colorize (~> 0.8.1) + concurrent-ruby + dentaku (~> 3) + gems (~> 0.8) + highline (~> 1.7) + httparty (~> 0.13) + kramdown (~> 1.5) + nanoc (~> 3.7.0) + net-ldap (~> 0.13) + nokogiri (>= 1.11.0) + pry (~> 0.10) + rake (~> 10) + rspec (~> 3) + rspec-legacy_formatters (~> 1) + rubocop (= 0.30) + scrub_rb (~> 1.0) + simplecov (~> 0.17) + simplecov-html (~> 0.10) + thor (~> 0.19) + yard (~> 0.8) + +GEM + remote: https://rubygems.org/ + specs: + activesupport (4.2.11.3) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + ast (2.4.2) + astrolabe (1.3.1) + parser (~> 2.2) + atp (1.1.3) + ast (~> 2) + origen (>= 0.2.3) + sexpistol (~> 0.0) + builder (3.2.4) + byebug (10.0.2) + coderay (1.1.3) + colored (1.2) + colorize (0.8.1) + concurrent-ruby (1.1.10) + coveralls (0.7.1) + multi_json (~> 1.3) + rest-client + simplecov (>= 0.7) + term-ansicolor + thor + cri (2.15.11) + dentaku (3.5.0) + concurrent-ruby + diff-lcs (1.5.0) + docile (1.4.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + gems (0.8.3) + highline (1.7.10) + http-accept (1.7.0) + http-cookie (1.0.4) + domain_name (~> 0.5) + httparty (0.20.0) + mime-types (~> 3.0) + multi_xml (>= 0.5.2) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.6.1) + kramdown (1.17.0) + loco (0.0.7) + method_source (1.0.0) + mime-types (3.4.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2022.0105) + minitest (5.15.0) + multi_json (1.15.0) + multi_xml (0.6.0) + nanoc (3.7.5) + cri (~> 2.3) + net-ldap (0.17.0) + netrc (0.11.0) + nokogiri (1.13.4-x86_64-linux) + racc (~> 1.4) + origen_debuggers (0.6.1) + origen (>= 0.2.6) + origen_testers (>= 0.5.0) + origen_doc_helpers (0.8.6) + origen (>= 0.7.15) + origen_jtag (0.22.1) + origen (~> 0.7, >= 0.7.35) + origen_testers (>= 0.13.2) + origen_stil (0.3.0) + ast (~> 2) + origen (>= 0.33.3) + treetop + origen_verilog (0.6.3) + ast (~> 2) + origen (>= 0.41.0) + treetop + parser (2.7.2.0) + ast (~> 2.4.1) + polyglot (0.3.5) + powerpack (0.1.3) + pry (0.14.1) + coderay (~> 1.1) + method_source (~> 1.0) + racc (1.6.0) + rainbow (2.2.2) + rake + rake (10.5.0) + require_all (1.5.0) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + ripper-tags (0.9.0) + rodf (1.2.0) + builder (>= 3.0) + rubyzip (>= 1.0) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-legacy_formatters (1.0.2) + rspec (~> 3.0) + rspec-mocks (3.11.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-support (3.11.0) + rubocop (0.30.0) + astrolabe (~> 1.3) + parser (>= 2.2.0.1, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.4) + ruby-progressbar (1.11.0) + rubyzip (2.3.2) + scrub_rb (1.0.1) + sexpistol (0.1.2) + simplecov (0.17.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sync (0.5.0) + term-ansicolor (1.7.1) + tins (~> 1.0) + thor (0.20.3) + thread_safe (0.3.6) + tins (1.31.0) + sync + treetop (1.6.11) + polyglot (~> 0.3) + tzinfo (1.2.9) + thread_safe (~> 0.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.1) + webrick (1.7.0) + yard (0.9.27) + webrick (~> 1.7.0) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + byebug (~> 10) + coveralls + loco + nokogiri + origen! + origen_app_generators! + origen_core_support! + origen_debuggers (~> 0) + origen_doc_helpers + origen_jtag + origen_sim! + origen_testers! + ripper-tags + +BUNDLED WITH + 2.3.7 From 69f395ec415e529b59c36d23ff9bcbd0e1e63773 Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Thu, 28 Apr 2022 10:13:32 -0500 Subject: [PATCH 20/40] try build and install local origen gem --- .github/workflows/regression_tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index f792b232..310da30b 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -24,8 +24,10 @@ jobs: run: rm Gemfile.lock - name: Install dependencies run: bundle install + - name: Gem Build Origen + run: gem build origen.gemspec -o origen.gem - name: Gem Install Origen - run: gem install origen + run: gem install origen.gem - name: Setup Dependencies run: origen -v - name: Run Origen Lint From 390a53cbf2a84ad220d20a9570ba3869c39934ec Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Thu, 28 Apr 2022 10:19:15 -0500 Subject: [PATCH 21/40] try again --- .github/workflows/regression_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 310da30b..c8fb0d03 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies run: bundle install - name: Gem Build Origen - run: gem build origen.gemspec -o origen.gem + run: gem build origen.gemspec --output origen.gem - name: Gem Install Origen run: gem install origen.gem - name: Setup Dependencies From 3b858e106a2a103c98e3a41cebd795d1ca279b99 Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Thu, 28 Apr 2022 10:21:19 -0500 Subject: [PATCH 22/40] remove ruby 2.5 --- .github/workflows/regression_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index c8fb0d03..28ddf202 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [ubuntu-latest] - ruby-version: [2.5, 2.6, 2.7] + ruby-version: [2.6, 2.7, 3.0, 3.1] runs-on: ${{ matrix.os }} From acf63fc697fb40753730299cba71d2829b608050 Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Thu, 28 Apr 2022 10:23:44 -0500 Subject: [PATCH 23/40] undo updates --- .github/workflows/regression_tests.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 28ddf202..f792b232 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [ubuntu-latest] - ruby-version: [2.6, 2.7, 3.0, 3.1] + ruby-version: [2.5, 2.6, 2.7] runs-on: ${{ matrix.os }} @@ -24,10 +24,8 @@ jobs: run: rm Gemfile.lock - name: Install dependencies run: bundle install - - name: Gem Build Origen - run: gem build origen.gemspec --output origen.gem - name: Gem Install Origen - run: gem install origen.gem + run: gem install origen - name: Setup Dependencies run: origen -v - name: Run Origen Lint From 16f5bdfc54d465058117b3118036c0e11531fc18 Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Thu, 28 Apr 2022 10:34:01 -0500 Subject: [PATCH 24/40] split out tests --- .github/workflows/linux_ruby3.yml | 38 +++++++++++++++++++++++++++++ .github/workflows/windows_ruby3.yml | 38 +++++++++++++++++++++++++++++ .github/workflows/windows_tests.yml | 36 +++++++++++++++++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 .github/workflows/linux_ruby3.yml create mode 100644 .github/workflows/windows_ruby3.yml create mode 100644 .github/workflows/windows_tests.yml diff --git a/.github/workflows/linux_ruby3.yml b/.github/workflows/linux_ruby3.yml new file mode 100644 index 00000000..23746f76 --- /dev/null +++ b/.github/workflows/linux_ruby3.yml @@ -0,0 +1,38 @@ +name: Origen Core Regression Tests +on: [push, pull_request] +jobs: + build: + strategy: + matrix: +# os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest] + ruby-version: [3.0] + + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-version }} + - name: Update Env + run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV + - name: Install Bundler + run: gem install bundler -v '> 2' + - name: Remove Gemfile.lock + run: rm Gemfile.lock + - name: Install dependencies + run: bundle install + - name: Build Origen Gem + run: gem build origen.gemspec --output origen.gem + - name: Gem Install Origen + run: gem install origen.gem + - name: Setup Dependencies + run: origen -v + - name: Set Origen to debug mode + run: origen m debug + - name: Run Spec tests + run: origen test -c + - name: Verify Building website + run: origen web compile --no-serve diff --git a/.github/workflows/windows_ruby3.yml b/.github/workflows/windows_ruby3.yml new file mode 100644 index 00000000..dd05fc4e --- /dev/null +++ b/.github/workflows/windows_ruby3.yml @@ -0,0 +1,38 @@ +name: Origen Core Regression Tests +on: [push, pull_request] +jobs: + build: + strategy: + matrix: +# os: [ubuntu-latest, windows-latest] + os: [windows-latest] + ruby-version: [3.0] + + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-version }} + - name: Update Env + run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV + - name: Install Bundler + run: gem install bundler -v '> 2' + - name: Remove Gemfile.lock + run: rm Gemfile.lock + - name: Install dependencies + run: bundle install + - name: Build Origen Gem + run: gem build origen.gemspec --output origen.gem + - name: Gem Install Origen + run: gem install origen.gem + - name: Setup Dependencies + run: origen -v + - name: Run Origen Lint + run: origen lint --no-correct + - name: Set Origen to debug mode + run: origen m debug + - name: Run Spec tests + run: origen test -c diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml new file mode 100644 index 00000000..061dffa5 --- /dev/null +++ b/.github/workflows/windows_tests.yml @@ -0,0 +1,36 @@ +name: Origen Core Regression Tests +on: [push, pull_request] +jobs: + build: + strategy: + matrix: +# os: [ubuntu-latest, windows-latest] + os: [windows-latest] + ruby-version: [2.5, 2.6, 2.7] + + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-version }} + - name: Update Env + run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV + - name: Install Bundler + run: gem install bundler -v '> 2' + - name: Remove Gemfile.lock + run: rm Gemfile.lock + - name: Install dependencies + run: bundle install + - name: Gem Install Origen + run: gem install origen + - name: Setup Dependencies + run: origen -v + - name: Run Origen Lint + run: origen lint --no-correct + - name: Set Origen to debug mode + run: origen m debug + - name: Run Spec tests + run: origen test -c From ab386f48c03ec5ecf50e2aa25b9bf53c95f13a54 Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Thu, 28 Apr 2022 10:35:56 -0500 Subject: [PATCH 25/40] fix names --- .github/workflows/linux_ruby3.yml | 2 +- .github/workflows/windows_ruby3.yml | 2 +- .github/workflows/windows_tests.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux_ruby3.yml b/.github/workflows/linux_ruby3.yml index 23746f76..ff9660cf 100644 --- a/.github/workflows/linux_ruby3.yml +++ b/.github/workflows/linux_ruby3.yml @@ -1,4 +1,4 @@ -name: Origen Core Regression Tests +name: Origen Core Regression Tests - Ruby 3 on: [push, pull_request] jobs: build: diff --git a/.github/workflows/windows_ruby3.yml b/.github/workflows/windows_ruby3.yml index dd05fc4e..8115cfb8 100644 --- a/.github/workflows/windows_ruby3.yml +++ b/.github/workflows/windows_ruby3.yml @@ -1,4 +1,4 @@ -name: Origen Core Regression Tests +name: Origen Core Regression Tests - Windows Ruby 3 on: [push, pull_request] jobs: build: diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index 061dffa5..140f0b5b 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -1,4 +1,4 @@ -name: Origen Core Regression Tests +name: Origen Core Regression Tests - Windows on: [push, pull_request] jobs: build: From 3d144c34f97325503c6c95d2723a9ba65b8f642f Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Thu, 28 Apr 2022 10:42:06 -0500 Subject: [PATCH 26/40] disable lint in ruby 3 tests --- .github/workflows/windows_ruby3.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/windows_ruby3.yml b/.github/workflows/windows_ruby3.yml index 8115cfb8..4e69a02c 100644 --- a/.github/workflows/windows_ruby3.yml +++ b/.github/workflows/windows_ruby3.yml @@ -30,8 +30,6 @@ jobs: run: gem install origen.gem - name: Setup Dependencies run: origen -v - - name: Run Origen Lint - run: origen lint --no-correct - name: Set Origen to debug mode run: origen m debug - name: Run Spec tests From a14b5db6fa415cb0480ff9e9889b07ce69ca0531 Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Thu, 28 Apr 2022 11:02:42 -0500 Subject: [PATCH 27/40] update kramdown --- Gemfile | 1 + origen.gemspec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 7942198d..457e0ae7 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,7 @@ gem 'origen_debuggers', '~> 0' gem 'ripper-tags' # gem 'nokogiri', '1.10.10' # Lock to this version to enable testing in Ruby 2.2 gem 'nokogiri' +gem 'kramdown', '2.4.0' # Plugins that provide guide pages gem "origen_testers", git: "https://github.com/Origen-SDK/origen_testers.git" diff --git a/origen.gemspec b/origen.gemspec index 2a68126e..3da13561 100644 --- a/origen.gemspec +++ b/origen.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "rspec-legacy_formatters", "~>1" spec.add_runtime_dependency "thor", "~>0.19" spec.add_runtime_dependency "nanoc", "~>3.7.0" - spec.add_runtime_dependency "kramdown", "~>1.5" + # spec.add_runtime_dependency "kramdown", "~>1.5" spec.add_runtime_dependency "rubocop", "0.30" # spec.add_runtime_dependency "rubocop" spec.add_runtime_dependency "coderay", "~>1.1" From 93043074fa1e284fff3f70304a7224f22dabe06a Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Thu, 28 Apr 2022 11:15:50 -0500 Subject: [PATCH 28/40] put back kramdown runtime dependency, no web compile ruby3 --- .github/workflows/linux_ruby3.yml | 2 -- Gemfile | 1 - origen.gemspec | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/linux_ruby3.yml b/.github/workflows/linux_ruby3.yml index ff9660cf..fbac9fa2 100644 --- a/.github/workflows/linux_ruby3.yml +++ b/.github/workflows/linux_ruby3.yml @@ -34,5 +34,3 @@ jobs: run: origen m debug - name: Run Spec tests run: origen test -c - - name: Verify Building website - run: origen web compile --no-serve diff --git a/Gemfile b/Gemfile index 457e0ae7..7942198d 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,6 @@ gem 'origen_debuggers', '~> 0' gem 'ripper-tags' # gem 'nokogiri', '1.10.10' # Lock to this version to enable testing in Ruby 2.2 gem 'nokogiri' -gem 'kramdown', '2.4.0' # Plugins that provide guide pages gem "origen_testers", git: "https://github.com/Origen-SDK/origen_testers.git" diff --git a/origen.gemspec b/origen.gemspec index 3da13561..9337a385 100644 --- a/origen.gemspec +++ b/origen.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "rspec-legacy_formatters", "~>1" spec.add_runtime_dependency "thor", "~>0.19" spec.add_runtime_dependency "nanoc", "~>3.7.0" - # spec.add_runtime_dependency "kramdown", "~>1.5" + spec.add_runtime_dependency "kramdown", "~>2.4" spec.add_runtime_dependency "rubocop", "0.30" # spec.add_runtime_dependency "rubocop" spec.add_runtime_dependency "coderay", "~>1.1" From e83f51ddb14f328314dde983957dafa52e1d9a9c Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 30 Apr 2022 09:33:05 -0500 Subject: [PATCH 29/40] attempt to restrict to ruby 3.0 --- .github/workflows/linux_ruby3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_ruby3.yml b/.github/workflows/linux_ruby3.yml index fbac9fa2..4ec4420f 100644 --- a/.github/workflows/linux_ruby3.yml +++ b/.github/workflows/linux_ruby3.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [ubuntu-latest] - ruby-version: [3.0] + ruby-version: [3.0.4] runs-on: ${{ matrix.os }} From e8c723de12df9cda0837b92d2c6d395b5593c641 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Sat, 30 Apr 2022 09:40:24 -0500 Subject: [PATCH 30/40] add lint back to ruby3 checks --- .github/workflows/linux_ruby3.yml | 2 ++ .github/workflows/windows_ruby3.yml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux_ruby3.yml b/.github/workflows/linux_ruby3.yml index 4ec4420f..fb9eef65 100644 --- a/.github/workflows/linux_ruby3.yml +++ b/.github/workflows/linux_ruby3.yml @@ -30,6 +30,8 @@ jobs: run: gem install origen.gem - name: Setup Dependencies run: origen -v + - name: Run Origen Lint + run: origen lint --no-correct - name: Set Origen to debug mode run: origen m debug - name: Run Spec tests diff --git a/.github/workflows/windows_ruby3.yml b/.github/workflows/windows_ruby3.yml index 4e69a02c..3f9b9ffa 100644 --- a/.github/workflows/windows_ruby3.yml +++ b/.github/workflows/windows_ruby3.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [windows-latest] - ruby-version: [3.0] + ruby-version: [3.0.4] runs-on: ${{ matrix.os }} @@ -30,6 +30,8 @@ jobs: run: gem install origen.gem - name: Setup Dependencies run: origen -v + - name: Run Origen Lint + run: origen lint --no-correct - name: Set Origen to debug mode run: origen m debug - name: Run Spec tests From 8f761f21682699a6d789ec0ac5e87a89af4f17fe Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Tue, 10 May 2022 10:12:26 -0500 Subject: [PATCH 31/40] Merging GA workflows --- .github/workflows/linux_ruby3.yml | 38 -------------------------- .github/workflows/regression_tests.yml | 6 ++-- .github/workflows/windows_ruby3.yml | 38 -------------------------- .github/workflows/windows_tests.yml | 8 ++++-- 4 files changed, 10 insertions(+), 80 deletions(-) delete mode 100644 .github/workflows/linux_ruby3.yml delete mode 100644 .github/workflows/windows_ruby3.yml diff --git a/.github/workflows/linux_ruby3.yml b/.github/workflows/linux_ruby3.yml deleted file mode 100644 index fb9eef65..00000000 --- a/.github/workflows/linux_ruby3.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Origen Core Regression Tests - Ruby 3 -on: [push, pull_request] -jobs: - build: - strategy: - matrix: -# os: [ubuntu-latest, windows-latest] - os: [ubuntu-latest] - ruby-version: [3.0.4] - - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby-version }} - - name: Update Env - run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV - - name: Install Bundler - run: gem install bundler -v '> 2' - - name: Remove Gemfile.lock - run: rm Gemfile.lock - - name: Install dependencies - run: bundle install - - name: Build Origen Gem - run: gem build origen.gemspec --output origen.gem - - name: Gem Install Origen - run: gem install origen.gem - - name: Setup Dependencies - run: origen -v - - name: Run Origen Lint - run: origen lint --no-correct - - name: Set Origen to debug mode - run: origen m debug - - name: Run Spec tests - run: origen test -c diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index f792b232..4b324ec5 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [ubuntu-latest] - ruby-version: [2.5, 2.6, 2.7] + ruby-version: [2.5, 2.6, 2.7, 3.0.4] runs-on: ${{ matrix.os }} @@ -24,8 +24,10 @@ jobs: run: rm Gemfile.lock - name: Install dependencies run: bundle install + - name: Build Origen Gem + run: gem build origen.gemspec --output origen.gem - name: Gem Install Origen - run: gem install origen + run: gem install origen.gem - name: Setup Dependencies run: origen -v - name: Run Origen Lint diff --git a/.github/workflows/windows_ruby3.yml b/.github/workflows/windows_ruby3.yml deleted file mode 100644 index 3f9b9ffa..00000000 --- a/.github/workflows/windows_ruby3.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Origen Core Regression Tests - Windows Ruby 3 -on: [push, pull_request] -jobs: - build: - strategy: - matrix: -# os: [ubuntu-latest, windows-latest] - os: [windows-latest] - ruby-version: [3.0.4] - - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby-version }} - - name: Update Env - run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV - - name: Install Bundler - run: gem install bundler -v '> 2' - - name: Remove Gemfile.lock - run: rm Gemfile.lock - - name: Install dependencies - run: bundle install - - name: Build Origen Gem - run: gem build origen.gemspec --output origen.gem - - name: Gem Install Origen - run: gem install origen.gem - - name: Setup Dependencies - run: origen -v - - name: Run Origen Lint - run: origen lint --no-correct - - name: Set Origen to debug mode - run: origen m debug - - name: Run Spec tests - run: origen test -c diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index 140f0b5b..41782c50 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [windows-latest] - ruby-version: [2.5, 2.6, 2.7] + ruby-version: [2.5, 2.6, 2.7, 3.0.4] runs-on: ${{ matrix.os }} @@ -24,8 +24,10 @@ jobs: run: rm Gemfile.lock - name: Install dependencies run: bundle install + - name: Build Origen Gem + run: gem build origen.gemspec --output origen.gem - name: Gem Install Origen - run: gem install origen + run: gem install origen.gem - name: Setup Dependencies run: origen -v - name: Run Origen Lint @@ -34,3 +36,5 @@ jobs: run: origen m debug - name: Run Spec tests run: origen test -c + - name: Verify Building website + run: origen web compile --no-serve From 0e0975bbe6adb43ca7de18c1dda10b9efd752b0e Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Tue, 10 May 2022 10:18:05 -0500 Subject: [PATCH 32/40] Revert "Merging GA workflows" This reverts commit 8f761f21682699a6d789ec0ac5e87a89af4f17fe. --- .github/workflows/linux_ruby3.yml | 38 ++++++++++++++++++++++++++ .github/workflows/regression_tests.yml | 6 ++-- .github/workflows/windows_ruby3.yml | 38 ++++++++++++++++++++++++++ .github/workflows/windows_tests.yml | 8 ++---- 4 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/linux_ruby3.yml create mode 100644 .github/workflows/windows_ruby3.yml diff --git a/.github/workflows/linux_ruby3.yml b/.github/workflows/linux_ruby3.yml new file mode 100644 index 00000000..fb9eef65 --- /dev/null +++ b/.github/workflows/linux_ruby3.yml @@ -0,0 +1,38 @@ +name: Origen Core Regression Tests - Ruby 3 +on: [push, pull_request] +jobs: + build: + strategy: + matrix: +# os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest] + ruby-version: [3.0.4] + + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-version }} + - name: Update Env + run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV + - name: Install Bundler + run: gem install bundler -v '> 2' + - name: Remove Gemfile.lock + run: rm Gemfile.lock + - name: Install dependencies + run: bundle install + - name: Build Origen Gem + run: gem build origen.gemspec --output origen.gem + - name: Gem Install Origen + run: gem install origen.gem + - name: Setup Dependencies + run: origen -v + - name: Run Origen Lint + run: origen lint --no-correct + - name: Set Origen to debug mode + run: origen m debug + - name: Run Spec tests + run: origen test -c diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 4b324ec5..f792b232 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [ubuntu-latest] - ruby-version: [2.5, 2.6, 2.7, 3.0.4] + ruby-version: [2.5, 2.6, 2.7] runs-on: ${{ matrix.os }} @@ -24,10 +24,8 @@ jobs: run: rm Gemfile.lock - name: Install dependencies run: bundle install - - name: Build Origen Gem - run: gem build origen.gemspec --output origen.gem - name: Gem Install Origen - run: gem install origen.gem + run: gem install origen - name: Setup Dependencies run: origen -v - name: Run Origen Lint diff --git a/.github/workflows/windows_ruby3.yml b/.github/workflows/windows_ruby3.yml new file mode 100644 index 00000000..3f9b9ffa --- /dev/null +++ b/.github/workflows/windows_ruby3.yml @@ -0,0 +1,38 @@ +name: Origen Core Regression Tests - Windows Ruby 3 +on: [push, pull_request] +jobs: + build: + strategy: + matrix: +# os: [ubuntu-latest, windows-latest] + os: [windows-latest] + ruby-version: [3.0.4] + + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-version }} + - name: Update Env + run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV + - name: Install Bundler + run: gem install bundler -v '> 2' + - name: Remove Gemfile.lock + run: rm Gemfile.lock + - name: Install dependencies + run: bundle install + - name: Build Origen Gem + run: gem build origen.gemspec --output origen.gem + - name: Gem Install Origen + run: gem install origen.gem + - name: Setup Dependencies + run: origen -v + - name: Run Origen Lint + run: origen lint --no-correct + - name: Set Origen to debug mode + run: origen m debug + - name: Run Spec tests + run: origen test -c diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index 41782c50..140f0b5b 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -6,7 +6,7 @@ jobs: matrix: # os: [ubuntu-latest, windows-latest] os: [windows-latest] - ruby-version: [2.5, 2.6, 2.7, 3.0.4] + ruby-version: [2.5, 2.6, 2.7] runs-on: ${{ matrix.os }} @@ -24,10 +24,8 @@ jobs: run: rm Gemfile.lock - name: Install dependencies run: bundle install - - name: Build Origen Gem - run: gem build origen.gemspec --output origen.gem - name: Gem Install Origen - run: gem install origen.gem + run: gem install origen - name: Setup Dependencies run: origen -v - name: Run Origen Lint @@ -36,5 +34,3 @@ jobs: run: origen m debug - name: Run Spec tests run: origen test -c - - name: Verify Building website - run: origen web compile --no-serve From 84a93b54215f99b567eb3e5e6c044bb963154193 Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Tue, 10 May 2022 10:22:46 -0500 Subject: [PATCH 33/40] try adding back web compile --- .github/workflows/linux_ruby3.yml | 2 ++ .github/workflows/windows_ruby3.yml | 2 ++ .github/workflows/windows_tests.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/linux_ruby3.yml b/.github/workflows/linux_ruby3.yml index fb9eef65..0544f1f5 100644 --- a/.github/workflows/linux_ruby3.yml +++ b/.github/workflows/linux_ruby3.yml @@ -36,3 +36,5 @@ jobs: run: origen m debug - name: Run Spec tests run: origen test -c + - name: Verify Building website + run: origen web compile --no-serve diff --git a/.github/workflows/windows_ruby3.yml b/.github/workflows/windows_ruby3.yml index 3f9b9ffa..b854e258 100644 --- a/.github/workflows/windows_ruby3.yml +++ b/.github/workflows/windows_ruby3.yml @@ -36,3 +36,5 @@ jobs: run: origen m debug - name: Run Spec tests run: origen test -c + - name: Verify Building website + run: origen web compile --no-serve diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index 140f0b5b..f1c77ba9 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -34,3 +34,5 @@ jobs: run: origen m debug - name: Run Spec tests run: origen test -c + - name: Verify Building website + run: origen web compile --no-serve From a005e1207e54fd22a378489201bd4efdafd3d177 Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Tue, 10 May 2022 11:03:00 -0500 Subject: [PATCH 34/40] add binstub setup --- .github/workflows/windows_tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index f1c77ba9..124e106b 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -28,6 +28,8 @@ jobs: run: gem install origen - name: Setup Dependencies run: origen -v + - name: Setup Bin Stubs + run: origen setup - name: Run Origen Lint run: origen lint --no-correct - name: Set Origen to debug mode From 502d7b9aadf0b0306bfa2f7397b7ddb8f4c8cd27 Mon Sep 17 00:00:00 2001 From: Paul Derouen Date: Tue, 10 May 2022 11:54:08 -0500 Subject: [PATCH 35/40] will come back to windows web compile with GA in another PR --- .github/workflows/windows_ruby3.yml | 4 ++-- .github/workflows/windows_tests.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows_ruby3.yml b/.github/workflows/windows_ruby3.yml index b854e258..3d1d3b90 100644 --- a/.github/workflows/windows_ruby3.yml +++ b/.github/workflows/windows_ruby3.yml @@ -36,5 +36,5 @@ jobs: run: origen m debug - name: Run Spec tests run: origen test -c - - name: Verify Building website - run: origen web compile --no-serve +# - name: Verify Building website +# run: origen web compile --no-serve diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml index 124e106b..19ec327f 100644 --- a/.github/workflows/windows_tests.yml +++ b/.github/workflows/windows_tests.yml @@ -36,5 +36,5 @@ jobs: run: origen m debug - name: Run Spec tests run: origen test -c - - name: Verify Building website - run: origen web compile --no-serve +# - name: Verify Building website +# run: origen web compile --no-serve From cf8892caf96dddcb9a30e3f3612f39ec62dbfe97 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Wed, 11 May 2022 07:14:16 -0700 Subject: [PATCH 36/40] trial with if-conditional in workflow --- .github/workflows/regression_tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index f792b232..a8f4564c 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -24,6 +24,9 @@ jobs: run: rm Gemfile.lock - name: Install dependencies run: bundle install + - name: Build Origen Gem + if: ruby-version == 3.0.4 + run: gem build origen.gemspec --output origen.gem - name: Gem Install Origen run: gem install origen - name: Setup Dependencies From 80554da7c3508a536fe64c570a8d9d567c87c95b Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Wed, 11 May 2022 07:16:05 -0700 Subject: [PATCH 37/40] again --- .github/workflows/regression_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index a8f4564c..2f009f57 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies run: bundle install - name: Build Origen Gem - if: ruby-version == 3.0.4 + if: matrix.ruby-version == 3.0.4 run: gem build origen.gemspec --output origen.gem - name: Gem Install Origen run: gem install origen From 321a9b6c51685e8f61c6dced43d63cbeade5c873 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Wed, 11 May 2022 07:16:57 -0700 Subject: [PATCH 38/40] again --- .github/workflows/regression_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 2f009f57..31bb5d9a 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies run: bundle install - name: Build Origen Gem - if: matrix.ruby-version == 3.0.4 + if: matrix.ruby-version == '3.0.4' run: gem build origen.gemspec --output origen.gem - name: Gem Install Origen run: gem install origen From 6f1ba620c576e06aa57156f8b6b9b156ae93fd74 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Wed, 11 May 2022 07:27:42 -0700 Subject: [PATCH 39/40] recombine workflows with if conditionals --- .github/workflows/linux_ruby3.yml | 40 -------------------------- .github/workflows/regression_tests.yml | 21 ++++++++++---- .github/workflows/windows_ruby3.yml | 40 -------------------------- .github/workflows/windows_tests.yml | 40 -------------------------- 4 files changed, 16 insertions(+), 125 deletions(-) delete mode 100644 .github/workflows/linux_ruby3.yml delete mode 100644 .github/workflows/windows_ruby3.yml delete mode 100644 .github/workflows/windows_tests.yml diff --git a/.github/workflows/linux_ruby3.yml b/.github/workflows/linux_ruby3.yml deleted file mode 100644 index 0544f1f5..00000000 --- a/.github/workflows/linux_ruby3.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Origen Core Regression Tests - Ruby 3 -on: [push, pull_request] -jobs: - build: - strategy: - matrix: -# os: [ubuntu-latest, windows-latest] - os: [ubuntu-latest] - ruby-version: [3.0.4] - - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby-version }} - - name: Update Env - run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV - - name: Install Bundler - run: gem install bundler -v '> 2' - - name: Remove Gemfile.lock - run: rm Gemfile.lock - - name: Install dependencies - run: bundle install - - name: Build Origen Gem - run: gem build origen.gemspec --output origen.gem - - name: Gem Install Origen - run: gem install origen.gem - - name: Setup Dependencies - run: origen -v - - name: Run Origen Lint - run: origen lint --no-correct - - name: Set Origen to debug mode - run: origen m debug - - name: Run Spec tests - run: origen test -c - - name: Verify Building website - run: origen web compile --no-serve diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index 31bb5d9a..da4f8819 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -4,9 +4,8 @@ jobs: build: strategy: matrix: -# os: [ubuntu-latest, windows-latest] - os: [ubuntu-latest] - ruby-version: [2.5, 2.6, 2.7] + os: [ubuntu-latest, windows-latest] + ruby-version: [2.5, 2.6, 2.7, 3.0.4] runs-on: ${{ matrix.os }} @@ -24,11 +23,20 @@ jobs: run: rm Gemfile.lock - name: Install dependencies run: bundle install - - name: Build Origen Gem + + # Work around Ruby 3 gem install issue + - name: Build Origen Gem - Ruby 3 work around if: matrix.ruby-version == '3.0.4' run: gem build origen.gemspec --output origen.gem - - name: Gem Install Origen + - name: Gem Install Origen - Ruby 3 work around + if: matrix.ruby-version == '3.0.4' + run: gem install origen.gem + + # Normal way of installing origen + - name: Gem Install Origen Ruby 2 + if: matrix.ruby-version == '2.5' || matrix.ruby-version == '2.6' || matrix.ruby-version == '2.7' run: gem install origen + - name: Setup Dependencies run: origen -v - name: Run Origen Lint @@ -37,5 +45,8 @@ jobs: run: origen m debug - name: Run Spec tests run: origen test -c + + # Temporarily disable web compile check in windows - name: Verify Building website + if: matrix.os == 'ubuntu-latest' run: origen web compile --no-serve diff --git a/.github/workflows/windows_ruby3.yml b/.github/workflows/windows_ruby3.yml deleted file mode 100644 index 3d1d3b90..00000000 --- a/.github/workflows/windows_ruby3.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Origen Core Regression Tests - Windows Ruby 3 -on: [push, pull_request] -jobs: - build: - strategy: - matrix: -# os: [ubuntu-latest, windows-latest] - os: [windows-latest] - ruby-version: [3.0.4] - - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby-version }} - - name: Update Env - run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV - - name: Install Bundler - run: gem install bundler -v '> 2' - - name: Remove Gemfile.lock - run: rm Gemfile.lock - - name: Install dependencies - run: bundle install - - name: Build Origen Gem - run: gem build origen.gemspec --output origen.gem - - name: Gem Install Origen - run: gem install origen.gem - - name: Setup Dependencies - run: origen -v - - name: Run Origen Lint - run: origen lint --no-correct - - name: Set Origen to debug mode - run: origen m debug - - name: Run Spec tests - run: origen test -c -# - name: Verify Building website -# run: origen web compile --no-serve diff --git a/.github/workflows/windows_tests.yml b/.github/workflows/windows_tests.yml deleted file mode 100644 index 19ec327f..00000000 --- a/.github/workflows/windows_tests.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Origen Core Regression Tests - Windows -on: [push, pull_request] -jobs: - build: - strategy: - matrix: -# os: [ubuntu-latest, windows-latest] - os: [windows-latest] - ruby-version: [2.5, 2.6, 2.7] - - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby-version }} - - name: Update Env - run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV - - name: Install Bundler - run: gem install bundler -v '> 2' - - name: Remove Gemfile.lock - run: rm Gemfile.lock - - name: Install dependencies - run: bundle install - - name: Gem Install Origen - run: gem install origen - - name: Setup Dependencies - run: origen -v - - name: Setup Bin Stubs - run: origen setup - - name: Run Origen Lint - run: origen lint --no-correct - - name: Set Origen to debug mode - run: origen m debug - - name: Run Spec tests - run: origen test -c -# - name: Verify Building website -# run: origen web compile --no-serve From 775f46bfa40212eb6faf70048079060a336f7673 Mon Sep 17 00:00:00 2001 From: Paul DeRouen Date: Wed, 11 May 2022 14:31:44 -0700 Subject: [PATCH 40/40] enable Ruby 3.1 checks (minus lint) --- .github/workflows/regression_tests.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml index da4f8819..4c6b101e 100644 --- a/.github/workflows/regression_tests.yml +++ b/.github/workflows/regression_tests.yml @@ -5,7 +5,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - ruby-version: [2.5, 2.6, 2.7, 3.0.4] + ruby-version: [2.5, 2.6, 2.7, 3.0.4, 3.1] runs-on: ${{ matrix.os }} @@ -26,10 +26,10 @@ jobs: # Work around Ruby 3 gem install issue - name: Build Origen Gem - Ruby 3 work around - if: matrix.ruby-version == '3.0.4' + if: matrix.ruby-version == '3.0.4' || matrix.ruby-version == '3.1' run: gem build origen.gemspec --output origen.gem - name: Gem Install Origen - Ruby 3 work around - if: matrix.ruby-version == '3.0.4' + if: matrix.ruby-version == '3.0.4' || matrix.ruby-version == '3.1' run: gem install origen.gem # Normal way of installing origen @@ -39,7 +39,10 @@ jobs: - name: Setup Dependencies run: origen -v + + # Rubocop 0.30.0 is not compatible with Ruby 3.1 - name: Run Origen Lint + if: matrix.ruby-version == '2.5' || matrix.ruby-version == '2.6' || matrix.ruby-version == '2.7' || matrix.ruby-version == '3.0.4' run: origen lint --no-correct - name: Set Origen to debug mode run: origen m debug