Skip to content

Commit 5bb2d5b

Browse files
author
Hasso Plattner Institut
committed
Export release-9009@1b5ce5a7
1 parent 0a163ef commit 5bb2d5b

File tree

359 files changed

+947
-18736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

359 files changed

+947
-18736
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Set up node
3+
description: Set up Node, Corepack, and installs deps via Yarn
4+
5+
runs:
6+
using: composite
7+
steps:
8+
- uses: actions/setup-node@v4
9+
with:
10+
node-version-file: .node-version
11+
cache: yarn
12+
env:
13+
# Workaround for https://github.com/actions/setup-node/issues/899
14+
SKIP_YARN_COREPACK_CHECK: true
15+
16+
- shell: sh
17+
run: corepack enable
18+
19+
- shell: sh
20+
run: yarn install --immutable --refresh-lockfile
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Set up node
3+
description: Install native deps, Ruby, and Gems
4+
5+
runs:
6+
using: composite
7+
steps:
8+
- shell: bash
9+
run: |
10+
sudo apt-get --quiet --quiet update
11+
sudo apt-get --quiet --quiet --option Dpkg::Use-Pty=0 install $(${{ github.workspace }}/scripts/read-deps)
12+
13+
- uses: ruby/setup-ruby@v1
14+
with:
15+
ruby-version: .ruby-version
16+
bundler-cache: true

.github/workflows/docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: docs
33

44
on:
55
push:
6+
pull_request:
67
workflow_dispatch:
78

89
jobs:

.github/workflows/lint.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
---
2+
name: lint
3+
4+
on:
5+
push:
6+
pull_request:
7+
workflow_dispatch:
8+
9+
jobs:
10+
editorconfig:
11+
runs-on: ubuntu-24.04
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: editorconfig-checker/action-editorconfig-checker@main
15+
- run: editorconfig-checker
16+
17+
js:
18+
runs-on: ubuntu-24.04
19+
steps:
20+
- uses: actions/checkout@v4
21+
- uses: ./.github/actions/setup-node
22+
- run: yarn run lint:js --color
23+
24+
css:
25+
runs-on: ubuntu-24.04
26+
steps:
27+
- uses: actions/checkout@v4
28+
- uses: ./.github/actions/setup-node
29+
- run: yarn run lint:css --color
30+
31+
markdown:
32+
runs-on: ubuntu-24.04
33+
steps:
34+
- uses: actions/checkout@v4
35+
- uses: ./.github/actions/setup-node
36+
- run: yarn run lint:md
37+
38+
# Check that all files are correctly formatted. Use `yarn run format`
39+
# to auto-format all files.
40+
format:
41+
runs-on: ubuntu-24.04
42+
steps:
43+
- uses: actions/checkout@v4
44+
- uses: ./.github/actions/setup-node
45+
- run: yarn run lint:format
46+
47+
rubocop:
48+
runs-on: ubuntu-24.04
49+
steps:
50+
- uses: actions/checkout@v4
51+
- uses: ./.github/actions/setup-ruby
52+
- run: bundle exec rubocop --color -f github -f progress
53+
54+
slim:
55+
runs-on: ubuntu-24.04
56+
steps:
57+
- uses: actions/checkout@v4
58+
- uses: ./.github/actions/setup-ruby
59+
- run: bundle exec slim-lint -r github ./app/**/*.slim
60+
61+
actionlint:
62+
runs-on: ubuntu-24.04
63+
steps:
64+
- uses: actions/checkout@v4
65+
- name: actionlint
66+
id: actionlint
67+
uses: raven-actions/actionlint@v2

.rubocop_todo.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Rails/ActiveRecordAliases:
2121
Rails/HelperInstanceVariable:
2222
Exclude:
2323
- app/helpers/item_context_helper.rb
24-
- app/helpers/peer_assessment/peer_assessment_context_helper.rb
2524

2625
#
2726
# We have too many specs with too many lets

Gemfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ gem 'maxminddb', '~> 0.1' # Location tracking
8484
gem 'acfs', '~> 2.0', '>= 2.0.0'
8585
gem 'xikolo-account', '~> 8.0', path: 'clients/xikolo-account'
8686
gem 'xikolo-course', '~> 12.0', path: 'clients/xikolo-course'
87-
gem 'xikolo-peer_assessment', '~> 3.0', path: 'clients/xikolo-peer_assessment'
8887
gem 'xikolo-pinboard', '~> 5.0', path: 'clients/xikolo-pinboard'
8988
gem 'xikolo-quiz', '~> 5.0', path: 'clients/xikolo-quiz'
9089
gem 'xikolo-submission', '~> 100.0', path: 'clients/xikolo-submission'
@@ -176,12 +175,12 @@ group :development, :test do
176175
gem 'rspec-its'
177176
gem 'rspec-rails', '~> 7.0'
178177
gem 'rubocop', '~> 1.73.0'
179-
gem 'rubocop-capybara', '~> 2.21.0'
180-
gem 'rubocop-factory_bot', '~> 2.26.1'
178+
gem 'rubocop-capybara', '~> 2.22.0'
179+
gem 'rubocop-factory_bot', '~> 2.27.0'
181180
gem 'rubocop-performance', '~> 1.24.0'
182181
gem 'rubocop-rails', '~> 2.30.0'
183182
gem 'rubocop-rspec', '~> 3.5.0'
184-
gem 'rubocop-rspec_rails', '~> 2.30.0'
183+
gem 'rubocop-rspec_rails', '~> 2.31.0'
185184
gem 'slim_lint'
186185
end
187186

@@ -198,11 +197,13 @@ group :test do
198197
gem 'json_spec'
199198
gem 'pdf-inspector', require: 'pdf/inspector'
200199
gem 'rails-controller-testing'
201-
gem 'rspec-teamcity', '~> 1.0', require: false
202200
gem 'selenium-webdriver', '~> 4.11'
203201
gem 'timecop'
204202
gem 'webmock'
205203
gem 'webrick'
204+
205+
gem 'rspec-github', '~> 3.0', require: false
206+
gem 'rspec-teamcity', '~> 1.0', require: false
206207
end
207208

208209
group :test, :integration do

Gemfile.lock

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ PATH
1414
xikolo-config
1515
xikolo-pinboard (~> 5.0)
1616

17-
PATH
18-
remote: clients/xikolo-peer_assessment
19-
specs:
20-
xikolo-peer_assessment (3.0.0)
21-
acfs (~> 2.0)
22-
activesupport
23-
2417
PATH
2518
remote: clients/xikolo-pinboard
2619
specs:
@@ -758,6 +751,8 @@ GEM
758751
rspec-expectations (3.13.3)
759752
diff-lcs (>= 1.2.0, < 2.0)
760753
rspec-support (~> 3.13.0)
754+
rspec-github (3.0.0)
755+
rspec-core (~> 3.0)
761756
rspec-its (2.0.0)
762757
rspec-core (>= 3.13.0)
763758
rspec-expectations (>= 3.13.0)
@@ -788,10 +783,12 @@ GEM
788783
unicode-display_width (>= 2.4.0, < 4.0)
789784
rubocop-ast (1.38.1)
790785
parser (>= 3.3.1.0)
791-
rubocop-capybara (2.21.0)
792-
rubocop (~> 1.41)
793-
rubocop-factory_bot (2.26.1)
794-
rubocop (~> 1.61)
786+
rubocop-capybara (2.22.0)
787+
lint_roller (~> 1.1)
788+
rubocop (~> 1.72, >= 1.72.1)
789+
rubocop-factory_bot (2.27.0)
790+
lint_roller (~> 1.1)
791+
rubocop (~> 1.72, >= 1.72.1)
795792
rubocop-performance (1.24.0)
796793
lint_roller (~> 1.1)
797794
rubocop (>= 1.72.1, < 2.0)
@@ -805,9 +802,10 @@ GEM
805802
rubocop-rspec (3.5.0)
806803
lint_roller (~> 1.1)
807804
rubocop (~> 1.72, >= 1.72.1)
808-
rubocop-rspec_rails (2.30.0)
809-
rubocop (~> 1.61)
810-
rubocop-rspec (~> 3, >= 3.0.1)
805+
rubocop-rspec_rails (2.31.0)
806+
lint_roller (~> 1.1)
807+
rubocop (~> 1.72, >= 1.72.1)
808+
rubocop-rspec (~> 3.5)
811809
ruby-next-core (1.1.1)
812810
ruby-progressbar (1.13.0)
813811
ruby-rc4 (0.1.5)
@@ -1060,16 +1058,17 @@ DEPENDENCIES
10601058
rexml (>= 3.2.1)
10611059
rspec (~> 3.10)
10621060
rspec-collection_matchers
1061+
rspec-github (~> 3.0)
10631062
rspec-its
10641063
rspec-rails (~> 7.0)
10651064
rspec-teamcity (~> 1.0)
10661065
rubocop (~> 1.73.0)
1067-
rubocop-capybara (~> 2.21.0)
1068-
rubocop-factory_bot (~> 2.26.1)
1066+
rubocop-capybara (~> 2.22.0)
1067+
rubocop-factory_bot (~> 2.27.0)
10691068
rubocop-performance (~> 1.24.0)
10701069
rubocop-rails (~> 2.30.0)
10711070
rubocop-rspec (~> 3.5.0)
1072-
rubocop-rspec_rails (~> 2.30.0)
1071+
rubocop-rspec_rails (~> 2.31.0)
10731072
ruby-saml (~> 1.14)
10741073
rubyzip (~> 2.4.0)
10751074
sanitize
@@ -1104,7 +1103,6 @@ DEPENDENCIES
11041103
xikolo-common!
11051104
xikolo-config!
11061105
xikolo-course (~> 12.0)!
1107-
xikolo-peer_assessment (~> 3.0)!
11081106
xikolo-pinboard (~> 5.0)!
11091107
xikolo-quiz (~> 5.0)!
11101108
xikolo-s3!

Procfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ course: cd services/course && overmind start -p 3300
44
grouping: cd services/grouping && overmind start -p 5600
55
news: cd services/news && overmind start -p 4300
66
notification: cd services/notification && overmind start -p 3200
7-
peerassessment: cd services/peerassessment && overmind start -p 5400
87
pinboard: cd services/pinboard && overmind start -p 3500
98
quiz: cd services/quiz && overmind start -p 3800
109
timeeffort: cd services/timeeffort && overmind start -p 6300

api/xikolo/v2/base.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ def self.mount_json_api_endpoint(path, klass)
5050
mount_json_api_endpoint 'features', V2::Features::Features
5151
mount_json_api_endpoint 'last-visits', V2::Courses::LastVisits
5252
mount_json_api_endpoint 'lti-exercises', V2::CourseItems::LtiExercises
53-
mount_json_api_endpoint 'peer-assessments', V2::CourseItems::PeerAssessments
5453
mount_json_api_endpoint 'pinboard-topics', V2::Pinboard::Topics
5554
mount_json_api_endpoint 'platform-events', V2::Activity::PlatformEvents
5655
mount_json_api_endpoint 'quizzes', V2::Quiz::Quizzes

api/xikolo/v2/course_items/peer_assessments.rb

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)