diff --git a/.github/workflows/deploy-mestra.yml b/.github/workflows/deploy-mestra.yml index 44559d8cf0..2ce18c49c8 100644 --- a/.github/workflows/deploy-mestra.yml +++ b/.github/workflows/deploy-mestra.yml @@ -6,14 +6,12 @@ on: types: - labeled -concurrency: - group: deploy-mestra - cancel-in-progress: true +concurrency: deploy-mestra jobs: deploy: if: ${{ github.event.action != 'labeled' || (github.event.action == 'labeled' && github.event.label.name == 'deploy mestra') }} - environment: + environment: name: mestra url: https://mestra.ugent.be runs-on: ubuntu-latest @@ -26,7 +24,7 @@ jobs: - name: Run deploy run: | echo "deploy mestra $GITHUB_SHA" | ssh -p 4840 dodona@mestra.ugent.be - - name: Remove deploy label + - name: Remove deploy label if: github.event.action == 'labeled' uses: buildsville/add-remove-label@v1 with: diff --git a/.github/workflows/deploy-naos.yml b/.github/workflows/deploy-naos.yml index a2c549b7ee..413e8297d0 100644 --- a/.github/workflows/deploy-naos.yml +++ b/.github/workflows/deploy-naos.yml @@ -7,9 +7,7 @@ on: types: - labeled -concurrency: - group: deploy-naos - cancel-in-progress: true +concurrency: deploy-naos jobs: deploy: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fd309064ac..e51ab9c03f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,10 +22,12 @@ jobs: env: MYSQL_DATABASE: "dodona_test" MYSQL_ROOT_PASSWORD: "dodona" + MARIADB_MYSQL_LOCALHOST_USER: 1 + MARIADB_MYSQL_LOCALHOST_GRANTS: USAGE MYSQL_HOST: "localhost" ports: - 3306:3306 - options: --health-cmd "mysqladmin ping -h localhost" --health-interval 10s --health-timeout 5s --health-retries 5 + options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=5 steps: - uses: actions/checkout@v3 - name: Use ruby from .ruby-version @@ -93,10 +95,12 @@ jobs: env: MYSQL_DATABASE: "dodona_test" MYSQL_ROOT_PASSWORD: "dodona" + MARIADB_MYSQL_LOCALHOST_USER: 1 + MARIADB_MYSQL_LOCALHOST_GRANTS: USAGE MYSQL_HOST: "localhost" ports: - 3306:3306 - options: --health-cmd "mysqladmin ping -h localhost" --health-interval 10s --health-timeout 5s --health-retries 5 + options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=5 steps: - uses: actions/checkout@v3 - name: Use ruby from .ruby-version diff --git a/Gemfile b/Gemfile index 5d8e848341..da699a8a1b 100644 --- a/Gemfile +++ b/Gemfile @@ -4,11 +4,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '~> 3.1.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 7.0.4' +gem 'rails', '~> 7.0.5' # Use mysql as the database for Active Record gem 'mysql2', '~> 0.5.5' # Use Puma as the app server -gem 'puma', '~> 6.2.2' +gem 'puma', '~> 6.3.0' # Use dart-sass for stylesheets gem 'cssbundling-rails', '~> 1.1.2' @@ -37,7 +37,7 @@ gem 'image_processing', '~> 1.12.2' gem 'bootsnap', '~> 1.16.0', require: false # used to validate container responses -gem 'json_schemer', '~> 0.2.24' +gem 'json_schemer', '~> 1.0.1' # delayed jobs gem 'delayed_job_active_record', '~> 4.1.7' @@ -46,7 +46,7 @@ gem 'delayed_job_active_record', '~> 4.1.7' gem 'delayed_job_web', '~>1.4.4' # pagination -gem 'will_paginate', '~>3.3.1' +gem 'will_paginate', '~>4.0.0' # markdown rendering and syntax highlighting gem 'kramdown', '~>2.4.0' @@ -132,7 +132,7 @@ gem 'faker', '~> 3.2.0' # Profiling gem 'flamegraph', '~> 0.9.5' gem 'memory_profiler', '~> 1.0.1' -gem 'rack-mini-profiler', '~> 3.0.0' +gem 'rack-mini-profiler', '~> 3.1.0' gem 'stackprof', '~> 0.2.25' gem 'ddtrace', '~> 1.12.0' diff --git a/Gemfile.lock b/Gemfile.lock index e3e1863472..23cf625b34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,67 +2,67 @@ GEM remote: https://rubygems.org/ specs: ace-rails-ap (4.5) - actioncable (7.0.4.3) - actionpack (= 7.0.4.3) - activesupport (= 7.0.4.3) + actioncable (7.0.5) + actionpack (= 7.0.5) + activesupport (= 7.0.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4.3) - actionpack (= 7.0.4.3) - activejob (= 7.0.4.3) - activerecord (= 7.0.4.3) - activestorage (= 7.0.4.3) - activesupport (= 7.0.4.3) + actionmailbox (7.0.5) + actionpack (= 7.0.5) + activejob (= 7.0.5) + activerecord (= 7.0.5) + activestorage (= 7.0.5) + activesupport (= 7.0.5) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4.3) - actionpack (= 7.0.4.3) - actionview (= 7.0.4.3) - activejob (= 7.0.4.3) - activesupport (= 7.0.4.3) + actionmailer (7.0.5) + actionpack (= 7.0.5) + actionview (= 7.0.5) + activejob (= 7.0.5) + activesupport (= 7.0.5) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4.3) - actionview (= 7.0.4.3) - activesupport (= 7.0.4.3) - rack (~> 2.0, >= 2.2.0) + actionpack (7.0.5) + actionview (= 7.0.5) + activesupport (= 7.0.5) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4.3) - actionpack (= 7.0.4.3) - activerecord (= 7.0.4.3) - activestorage (= 7.0.4.3) - activesupport (= 7.0.4.3) + actiontext (7.0.5) + actionpack (= 7.0.5) + activerecord (= 7.0.5) + activestorage (= 7.0.5) + activesupport (= 7.0.5) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4.3) - activesupport (= 7.0.4.3) + actionview (7.0.5) + activesupport (= 7.0.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.4.3) - activesupport (= 7.0.4.3) + activejob (7.0.5) + activesupport (= 7.0.5) globalid (>= 0.3.6) - activemodel (7.0.4.3) - activesupport (= 7.0.4.3) - activerecord (7.0.4.3) - activemodel (= 7.0.4.3) - activesupport (= 7.0.4.3) - activestorage (7.0.4.3) - actionpack (= 7.0.4.3) - activejob (= 7.0.4.3) - activerecord (= 7.0.4.3) - activesupport (= 7.0.4.3) + activemodel (7.0.5) + activesupport (= 7.0.5) + activerecord (7.0.5) + activemodel (= 7.0.5) + activesupport (= 7.0.5) + activestorage (7.0.5) + actionpack (= 7.0.5) + activejob (= 7.0.5) + activerecord (= 7.0.5) + activesupport (= 7.0.5) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4.3) + activesupport (7.0.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -160,8 +160,6 @@ GEM docker-api (2.2.0) excon (>= 0.47.0) multi_json - ecma-re-validator (0.4.0) - regexp_parser (~> 2.2) ed25519 (1.3.0) erubi (1.12.0) exception_notification (4.5.0) @@ -222,11 +220,10 @@ GEM bindata faraday (~> 2.0) faraday-follow_redirects - json_schemer (0.2.24) - ecma-re-validator (~> 0.3) + json_schemer (1.0.1) hana (~> 1.3) regexp_parser (~> 2.0) - uri_template (~> 0.7) + simpleidn (~> 0.2) jwt (2.7.0) kramdown (2.4.0) rexml @@ -242,7 +239,7 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.21.2) + loofah (2.21.3) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -340,13 +337,13 @@ GEM pretender (0.4.0) actionpack (>= 5.2) public_suffix (5.0.1) - puma (6.2.2) + puma (6.3.0) nio4r (~> 2.0) pundit (2.3.0) activesupport (>= 3.0.0) racc (1.6.2) rack (2.2.7) - rack-mini-profiler (3.0.0) + rack-mini-profiler (3.1.0) rack (>= 1.2.0) rack-oauth2 (2.2.0) activesupport @@ -359,20 +356,20 @@ GEM rack rack-test (2.1.0) rack (>= 1.3) - rails (7.0.4.3) - actioncable (= 7.0.4.3) - actionmailbox (= 7.0.4.3) - actionmailer (= 7.0.4.3) - actionpack (= 7.0.4.3) - actiontext (= 7.0.4.3) - actionview (= 7.0.4.3) - activejob (= 7.0.4.3) - activemodel (= 7.0.4.3) - activerecord (= 7.0.4.3) - activestorage (= 7.0.4.3) - activesupport (= 7.0.4.3) + rails (7.0.5) + actioncable (= 7.0.5) + actionmailbox (= 7.0.5) + actionmailer (= 7.0.5) + actionpack (= 7.0.5) + actiontext (= 7.0.5) + actionview (= 7.0.5) + activejob (= 7.0.5) + activemodel (= 7.0.5) + activerecord (= 7.0.5) + activestorage (= 7.0.5) + activesupport (= 7.0.5) bundler (>= 1.15.0) - railties (= 7.0.4.3) + railties (= 7.0.5) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -385,9 +382,9 @@ GEM rails-i18n (7.0.7) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.4.3) - actionpack (= 7.0.4.3) - activesupport (= 7.0.4.3) + railties (7.0.5) + actionpack (= 7.0.5) + activesupport (= 7.0.5) method_source rake (>= 12.2) thor (~> 1.0) @@ -441,6 +438,8 @@ GEM simplecov (~> 0.19) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) + simpleidn (0.2.1) + unf (~> 0.1.4) sinatra (3.0.4) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) @@ -466,7 +465,7 @@ GEM attr_required (>= 0.0.5) faraday (~> 2.0) faraday-follow_redirects - terser (1.1.15) + terser (1.1.16) execjs (>= 0.3.0, < 3) test-prof (1.2.1) thor (1.2.2) @@ -474,8 +473,10 @@ GEM timeout (0.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) unicode-display_width (2.4.2) - uri_template (0.7.0) validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) @@ -502,7 +503,7 @@ GEM websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - will_paginate (3.3.1) + will_paginate (4.0.0) xpath (3.2.0) nokogiri (~> 1.8) zeitwerk (2.6.8) @@ -547,7 +548,7 @@ DEPENDENCIES image_processing (~> 1.12.2) jbuilder (~> 2.11.5) jsbundling-rails (~> 1.1.1) - json_schemer (~> 0.2.24) + json_schemer (~> 1.0.1) jwt (~> 2.7.0) kramdown (~> 2.4.0) kramdown-parser-gfm (~> 1.1.0) @@ -567,10 +568,10 @@ DEPENDENCIES omniauth_openid_connect (~> 0.7.1) premailer-rails (~> 1.12.0) pretender (~> 0.4.0) - puma (~> 6.2.2) + puma (~> 6.3.0) pundit (~> 2.3.0) - rack-mini-profiler (~> 3.0.0) - rails (~> 7.0.4) + rack-mini-profiler (~> 3.1.0) + rails (~> 7.0.5) rails-controller-testing (~> 1.0.5) rails-i18n (~> 7.0.7) rb-readline (~> 0.5.5) @@ -589,7 +590,7 @@ DEPENDENCIES tzinfo-data web-console (~> 4.2.0) webmock - will_paginate (~> 3.3.1) + will_paginate (~> 4.0.0) RUBY VERSION ruby 3.1.2p20 diff --git a/app/assets/javascripts/components/annotations/machine_annotation.ts b/app/assets/javascripts/components/annotations/machine_annotation.ts index 93e744e0b3..2020e0bad4 100644 --- a/app/assets/javascripts/components/annotations/machine_annotation.ts +++ b/app/assets/javascripts/components/annotations/machine_annotation.ts @@ -31,8 +31,8 @@ export class MachineAnnotation extends ShadowlessLitElement { render(): TemplateResult { return html`