diff --git a/.github/workflows/build-and-release-package.yaml b/.github/workflows/build-and-release-package.yaml index 087d843..2afd6a3 100644 --- a/.github/workflows/build-and-release-package.yaml +++ b/.github/workflows/build-and-release-package.yaml @@ -23,7 +23,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.1.2' + ruby-version: '3.3.6' - name: Install dependencies run: | diff --git a/.ruby-version b/.ruby-version index ef538c2..9c25013 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.2 +3.3.6 diff --git a/Dockerfile b/Dockerfile index d32710c..9678676 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.1.2 +FROM ruby:3.3.6 ENV INSTALL_PATH=/opt/inferno/ ENV APP_ENV=production diff --git a/Gemfile b/Gemfile index 896bf02..0096f36 100644 --- a/Gemfile +++ b/Gemfile @@ -2,9 +2,9 @@ source "https://rubygems.org" -ruby '3.1.2' +ruby '3.3.6' -gem 'inferno_core', '~> 0.4.44' +gem 'inferno_core', '~> 0.6.1' gem 'pg' # This loads the test kit suites @@ -12,11 +12,11 @@ gem 'pg' # also point to git repos, or with some extra # Docker configuration relative directories -gem 'au_core_test_kit', git: 'https://github.com/hl7au/au-fhir-core-inferno', ref: 'bb8de66a310a6dcb800b71e9da83a2a6221346c3' -gem 'au_ips_inferno', git: 'https://github.com/beda-software/au-ips-inferno', ref: '7ce238858e07a8a46d934d2b46423d757cd53446' +gem 'au_core_test_kit', '~> 0.0.16' +gem 'au_ips_inferno', git: 'https://github.com/beda-software/au-ips-inferno', ref: '507ab792ec0a639d7e28e7389dcc51a4fc135cb0' gem 'validation_test_kit', git: 'https://github.com/beda-software/validation-test-kit' -gem 'ips_test_kit', git: 'https://github.com/beda-software/ips-test-kit', ref: 'c84ae59395c36422364cdf733b4e24f5b64a5670' -gem 'ipa_test_kit', git: 'https://github.com/inferno-framework/ipa-test-kit' +gem 'ips_test_kit', '~> 0.10.2' +gem 'ipa_test_kit', '~> 0.4.1' gem 'sidekiq-cron' diff --git a/Gemfile.lock b/Gemfile.lock index 307759f..bcfe0b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,10 @@ GIT remote: https://github.com/beda-software/au-ips-inferno - revision: 7ce238858e07a8a46d934d2b46423d757cd53446 - ref: 7ce238858e07a8a46d934d2b46423d757cd53446 + revision: 507ab792ec0a639d7e28e7389dcc51a4fc135cb0 + ref: 507ab792ec0a639d7e28e7389dcc51a4fc135cb0 specs: au_ips_inferno (0.0.1) - inferno_core (~> 0.4.38) - -GIT - remote: https://github.com/beda-software/ips-test-kit - revision: c84ae59395c36422364cdf733b4e24f5b64a5670 - ref: c84ae59395c36422364cdf733b4e24f5b64a5670 - specs: - ips_test_kit (0.10.1) - inferno_core (>= 0.4.37) + inferno_core (~> 0.6.1) GIT remote: https://github.com/beda-software/validation-test-kit @@ -21,29 +13,10 @@ GIT validation_test_kit (0.0.1) inferno_core (>= 0.4.2) -GIT - remote: https://github.com/hl7au/au-fhir-core-inferno - revision: bb8de66a310a6dcb800b71e9da83a2a6221346c3 - ref: bb8de66a310a6dcb800b71e9da83a2a6221346c3 - specs: - au_core_test_kit (0.0.16) - inferno_core (>= 0.4.2) - smart_app_launch_test_kit (>= 0.4.0) - tls_test_kit (~> 0.2.0) - -GIT - remote: https://github.com/inferno-framework/ipa-test-kit - revision: af4c5cc2d295807e4045df8bb2f2cb1940e9953f - specs: - ipa_test_kit (0.4.1) - inferno_core (>= 0.4.37) - smart_app_launch_test_kit (~> 0.3) - tls_test_kit (~> 0.2.0) - GEM remote: https://rubygems.org/ specs: - activesupport (6.1.7.8) + activesupport (6.1.7.10) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -52,21 +25,28 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aes_key_wrap (1.1.0) + au_core_test_kit (0.0.16) + inferno_core (>= 0.4.2) + smart_app_launch_test_kit (>= 0.4.0) + tls_test_kit (~> 0.2.0) base62-rb (0.3.1) base64 (0.2.0) bcp47 (0.3.3) i18n - bigdecimal (3.1.8) + bigdecimal (3.1.9) bindata (2.5.0) blueprinter (0.25.2) byebug (11.1.3) coderay (1.1.3) colorator (1.1.0) concurrent-ruby (1.3.4) - connection_pool (2.4.1) + connection_pool (2.5.0) crack (1.0.0) bigdecimal rexml + cronex (0.15.0) + tzinfo + unicode (>= 0.4.4.5) database_cleaner (1.99.0) database_cleaner-sequel (1.99.0) database_cleaner (~> 1.99.0) @@ -118,8 +98,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -127,7 +107,14 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.1) faraday (~> 1.0) - ffi (1.17.0) + ffi (1.17.1-aarch64-linux-gnu) + ffi (1.17.1-aarch64-linux-musl) + ffi (1.17.1-arm-linux-gnu) + ffi (1.17.1-arm-linux-musl) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86_64-darwin) + ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.1-x86_64-linux-musl) fhir_client (6.0.0) activesupport (>= 3) addressable (>= 2.3) @@ -160,7 +147,19 @@ GEM raabro (~> 1.4) globalid (1.2.1) activesupport (>= 6.1) - google-protobuf (4.28.2-x86_64-linux) + google-protobuf (4.29.3) + bigdecimal + rake (>= 13) + google-protobuf (4.29.3-aarch64-linux) + bigdecimal + rake (>= 13) + google-protobuf (4.29.3-arm64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.29.3-x86_64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.29.3-x86_64-linux) bigdecimal rake (>= 13) hanami-controller (2.0.0) @@ -178,18 +177,19 @@ GEM dry-core (~> 1.0, < 2) dry-transformer (~> 1.0, < 2) hansi (0.2.1) - hashdiff (1.1.1) + hashdiff (1.1.2) http-accept (1.7.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http_parser.rb (0.8.0) httpclient (2.8.3) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) - inferno_core (0.4.44) + inferno_core (0.6.1) activesupport (~> 6.1.7.5) base62-rb (= 0.3.1) blueprinter (= 0.25.2) + concurrent-ruby (= 1.3.4) dotenv (~> 2.7) dry-configurable (= 1.0.0) dry-container (= 0.10.0) @@ -213,6 +213,12 @@ GEM sqlite3 (~> 1.4) thor (~> 1.2.1) tty-markdown (~> 0.7.1) + ipa_test_kit (0.4.1) + inferno_core (>= 0.4.37) + smart_app_launch_test_kit (~> 0.3) + tls_test_kit (~> 0.2.0) + ips_test_kit (0.10.2) + inferno_core (>= 0.4.37) jekyll (4.3.4) addressable (~> 2.4) colorator (~> 1.0) @@ -238,24 +244,24 @@ GEM aes_key_wrap bindata httpclient - jwt (2.9.3) + jwt (2.10.1) base64 - kramdown (2.4.0) - rexml + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.1) + logger (1.6.5) mercenary (0.4.0) method_source (1.1.0) mime-types (3.6.0) logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.1105) - minitest (5.25.1) + mime-types-data (3.2025.0107) + minitest (5.25.4) multi_json (1.15.0) multi_xml (0.7.1) bigdecimal (~> 3.1) @@ -267,7 +273,21 @@ GEM mustermann (= 1.1.2) netrc (0.11.0) nio4r (2.7.4) - nokogiri (1.16.7-x86_64-linux) + nokogiri (1.18.2-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.2-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-arm-linux-musl) + racc (~> 1.4) + nokogiri (1.18.2-arm64-darwin) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-x86_64-linux-musl) racc (~> 1.4) oauth2 (1.4.11) faraday (>= 0.17.3, < 3.0) @@ -280,7 +300,7 @@ GEM tty-color (~> 0.5) pathutil (0.16.2) forwardable-extended (~> 2.6) - pg (1.5.8) + pg (1.5.9) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -292,25 +312,25 @@ GEM nio4r (~> 2.0) raabro (1.4.0) racc (1.8.1) - rack (2.2.9) + rack (2.2.10) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - redis-client (0.22.2) + redis-client (0.23.2) connection_pool 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.3.8) - rouge (4.4.0) + rexml (3.4.0) + rouge (4.5.1) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.1) + rspec-core (3.13.2) rspec-support (~> 3.13.0) rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) @@ -318,27 +338,45 @@ GEM rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.1) + rspec-support (3.13.2) ruby2_keywords (0.0.5) safe_yaml (1.0.5) - sass-embedded (1.79.4) - google-protobuf (~> 4.27) - rake (>= 13) + sass-embedded (1.83.4-aarch64-linux-gnu) + google-protobuf (~> 4.29) + sass-embedded (1.83.4-aarch64-linux-musl) + google-protobuf (~> 4.29) + sass-embedded (1.83.4-arm-linux-gnueabihf) + google-protobuf (~> 4.29) + sass-embedded (1.83.4-arm-linux-musleabihf) + google-protobuf (~> 4.29) + sass-embedded (1.83.4-arm64-darwin) + google-protobuf (~> 4.29) + sass-embedded (1.83.4-x86_64-darwin) + google-protobuf (~> 4.29) + sass-embedded (1.83.4-x86_64-linux-gnu) + google-protobuf (~> 4.29) + sass-embedded (1.83.4-x86_64-linux-musl) + google-protobuf (~> 4.29) sequel (5.42.0) sidekiq (7.2.4) concurrent-ruby (< 2) connection_pool (>= 2.3.0) rack (>= 2.2.4) redis-client (>= 0.19.0) - sidekiq-cron (1.12.0) - fugit (~> 1.8) + sidekiq-cron (2.1.0) + cronex (>= 0.13.0) + fugit (~> 1.8, >= 1.11.1) globalid (>= 1.0.1) - sidekiq (>= 6) - smart_app_launch_test_kit (0.4.4) + sidekiq (>= 6.5.0) + smart_app_launch_test_kit (0.4.6) inferno_core (>= 0.4.2) json-jwt (~> 1.15.3) jwt (~> 2.6) tls_test_kit (~> 0.2.0) + sqlite3 (1.7.3-aarch64-linux) + sqlite3 (1.7.3-arm-linux) + sqlite3 (1.7.3-arm64-darwin) + sqlite3 (1.7.3-x86_64-darwin) sqlite3 (1.7.3-x86_64-linux) strings (0.2.1) strings-ansi (~> 0.2) @@ -348,8 +386,8 @@ GEM terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.2) - tilt (2.4.0) - tls_test_kit (0.2.2) + tilt (2.6.0) + tls_test_kit (0.2.3) inferno_core (>= 0.4.2) tty-color (0.6.0) tty-markdown (0.7.2) @@ -362,26 +400,38 @@ GEM tty-screen (0.8.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) + unicode (0.4.4.5) unicode-display_width (2.6.0) unicode_utils (1.4.0) webmock (3.24.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.8.2) - zeitwerk (2.6.18) + webrick (1.9.1) + zeitwerk (2.7.1) PLATFORMS - x86_64-linux + aarch64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux + arm-linux-gnu + arm-linux-gnueabihf + arm-linux-musl + arm-linux-musleabihf + arm64-darwin + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES - au_core_test_kit! + au_core_test_kit (~> 0.0.16) au_ips_inferno! database_cleaner-sequel (~> 1.8) factory_bot (~> 6.1) - inferno_core (~> 0.4.44) - ipa_test_kit! - ips_test_kit! + inferno_core (~> 0.6.1) + ipa_test_kit (~> 0.4.1) + ips_test_kit (~> 0.10.2) jekyll pg rspec (~> 3.10) @@ -390,7 +440,7 @@ DEPENDENCIES webmock (~> 3.11) RUBY VERSION - ruby 3.1.2p20 + ruby 3.3.6p108 BUNDLED WITH - 2.3.7 + 2.6.3 diff --git a/compose.yml b/compose.yml index 08219e9..80d7e4b 100644 --- a/compose.yml +++ b/compose.yml @@ -62,7 +62,9 @@ services: mem_limit: 100m restart: unless-stopped validator-api: - image: pavelrozhkov/wrapper:6.3.11 + # image: pavelrozhkov/wrapper:6.3.11 + # image: markiantorno/validator-wrapper:1.0.58-SNAPSHOT + image: ghcr.io/beda-software/validator-wrapper:latest environment: SESSION_CACHE_DURATION: -1 volumes: