Skip to content

Commit fd4d9a3

Browse files
Barb CutlerBarb Cutler
authored andcommitted
Merge branch 'main' of github.com:Submitty/submitty.github.io into sysadmin-note-http2
2 parents 3642103 + e18f63f commit fd4d9a3

File tree

289 files changed

+1692
-609
lines changed

Some content is hidden

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

289 files changed

+1692
-609
lines changed

.bundle/config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
---
22
BUNDLE_PATH: "vendor/bundle"
3+
BUNDLE_FROZEN: "false"

Gemfile.lock

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,46 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.0.4.2)
4+
activesupport (7.1.2)
5+
base64
6+
bigdecimal
57
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
connection_pool (>= 2.2.5)
9+
drb
610
i18n (>= 1.6, < 2)
711
minitest (>= 5.1)
12+
mutex_m
813
tzinfo (~> 2.0)
9-
addressable (2.8.1)
14+
addressable (2.8.6)
1015
public_suffix (>= 2.0.2, < 6.0)
16+
base64 (0.2.0)
17+
bigdecimal (3.1.4)
1118
coffee-script (2.4.1)
1219
coffee-script-source
1320
execjs
1421
coffee-script-source (1.11.1)
1522
colorator (1.1.0)
16-
commonmarker (0.23.8)
17-
concurrent-ruby (1.2.0)
18-
dnsruby (1.61.9)
19-
simpleidn (~> 0.1)
23+
commonmarker (0.23.10)
24+
concurrent-ruby (1.2.2)
25+
connection_pool (2.4.1)
26+
dnsruby (1.70.0)
27+
simpleidn (~> 0.2.1)
28+
drb (2.2.0)
29+
ruby2_keywords
2030
em-websocket (0.5.3)
2131
eventmachine (>= 0.12.9)
2232
http_parser.rb (~> 0)
2333
ethon (0.16.0)
2434
ffi (>= 1.15.0)
2535
eventmachine (1.2.7)
26-
eventmachine (1.2.7-x64-mingw32)
27-
execjs (2.8.1)
28-
faraday (2.7.4)
36+
execjs (2.9.1)
37+
faraday (2.7.12)
38+
base64
2939
faraday-net_http (>= 2.0, < 3.1)
3040
ruby2_keywords (>= 0.0.4)
3141
faraday-net_http (3.0.2)
32-
ffi (1.15.5)
33-
ffi (1.15.5-x64-mingw32)
42+
ffi (1.16.3)
43+
ffi (1.16.3-x64-mingw-ucrt)
3444
forwardable-extended (2.6.0)
3545
gemoji (3.0.1)
3646
github-pages (228)
@@ -96,7 +106,7 @@ GEM
96106
typhoeus (~> 1.3)
97107
yell (~> 2.0)
98108
http_parser.rb (0.8.0)
99-
i18n (1.12.0)
109+
i18n (1.14.1)
100110
concurrent-ruby (~> 1.0)
101111
jekyll (3.9.3)
102112
addressable (~> 2.4)
@@ -215,30 +225,31 @@ GEM
215225
rb-fsevent (~> 0.10, >= 0.10.3)
216226
rb-inotify (~> 0.9, >= 0.9.10)
217227
mercenary (0.3.6)
218-
mini_portile2 (2.8.1)
219228
minima (2.5.1)
220229
jekyll (>= 3.5, < 5.0)
221230
jekyll-feed (~> 0.9)
222231
jekyll-seo-tag (~> 2.1)
223-
minitest (5.17.0)
224-
nokogiri (1.14.1)
225-
mini_portile2 (~> 2.8.0)
232+
minitest (5.20.0)
233+
mutex_m (0.2.0)
234+
nokogiri (1.15.5-arm64-darwin)
226235
racc (~> 1.4)
227-
nokogiri (1.14.1-x64-mingw32)
236+
nokogiri (1.15.5-x64-mingw-ucrt)
237+
racc (~> 1.4)
238+
nokogiri (1.15.5-x86_64-linux)
228239
racc (~> 1.4)
229240
octokit (4.25.1)
230241
faraday (>= 1, < 3)
231242
sawyer (~> 0.9)
232-
parallel (1.22.1)
243+
parallel (1.23.0)
233244
pathutil (0.16.2)
234245
forwardable-extended (~> 2.6)
235246
public_suffix (4.0.7)
236-
racc (1.6.2)
247+
racc (1.7.3)
237248
rainbow (3.1.1)
238249
rb-fsevent (0.11.2)
239250
rb-inotify (0.10.1)
240251
ffi (~> 1.0)
241-
rexml (3.2.5)
252+
rexml (3.2.6)
242253
rouge (3.26.0)
243254
ruby2_keywords (0.0.5)
244255
rubyzip (2.3.2)
@@ -255,26 +266,27 @@ GEM
255266
unf (~> 0.1.4)
256267
terminal-table (1.8.0)
257268
unicode-display_width (~> 1.1, >= 1.1.1)
258-
typhoeus (1.4.0)
269+
typhoeus (1.4.1)
259270
ethon (>= 0.9.0)
260271
tzinfo (2.0.6)
261272
concurrent-ruby (~> 1.0)
262273
unf (0.1.4)
263274
unf_ext
264-
unf_ext (0.0.8.2)
265-
unf_ext (0.0.8.2-x64-mingw32)
275+
unf_ext (0.0.9.1)
276+
unf_ext (0.0.9.1-x64-mingw-ucrt)
266277
unicode-display_width (1.8.0)
267278
webrick (1.8.1)
268279
yell (2.2.2)
269280

270281
PLATFORMS
271-
ruby
272-
x64-mingw32
282+
arm64-darwin-20
283+
x64-mingw-ucrt
284+
x86_64-linux
273285

274286
DEPENDENCIES
275287
github-pages (= 228)
276288
html-proofer (~> 3.19.4)
277289
webrick (~> 1.8)
278290

279291
BUNDLED WITH
280-
2.2.24
292+
2.4.21

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ by running:
4141
```
4242

4343
* _NOTE: During the install, it may hang up when installing the
44-
dependency ``nokogiri``. Don't worry: press enter and it should
45-
continue.
44+
dependency ``nokogiri``. Don't worry: continue waiting. If it still is stalling
45+
here, press enter and it should continue._
4646

4747

4848
* _NOTE: If an error is thrown during the installation process you

_docs/developer/development_instructions/index.md

Lines changed: 39 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ complicated and expensive steps at the bottom of the page._
2828

2929
Please also see [Installation Version Notes](/sysadmin/installation/version_notes)
3030

31-
3231
---
3332

3433
## Submitty Help - List of Shortcuts
@@ -55,8 +54,9 @@ Please also see [Installation Version Notes](/sysadmin/installation/version_note
5554
## Website and Bin Script Changes
5655

5756
* If you have only made minor or modest visual changes to website
58-
(e.g., the html, css, twig, or php files), or other files in the
59-
`site` folder, you can apply those changes by running this shortcut:
57+
(e.g., the html, css, twig, or php files), other files in the `site`
58+
folder, or translation files in the Localization repository, you can
59+
apply those changes by running this shortcut:
6060

6161
```
6262
submitty_install_site
@@ -124,9 +124,7 @@ be able to reload the website and see the update.
124124
See also: [PhpStorm configuration instructions](/developer/getting_started/phpstorm)
125125

126126

127-
---
128-
129-
## Clearing Your Browser Cache
127+
### Clearing Your Browser Cache
130128

131129

132130
* If the JavaScript files have changed and there are errors or you do not see the
@@ -162,6 +160,9 @@ include more significant Submitty source code changes, it will likely
162160
be necessary to conduct a more complete update and reset re-set of all
163161
of the Submitty source code.
164162

163+
164+
165+
165166
* In these cases, run this shortcut in the vagrant terminal:
166167

167168
```
@@ -186,9 +187,12 @@ of the Submitty source code.
186187
sudo /usr/local/submitty/.setup/INSTALL_SUBMITTY.sh clean
187188
```
188189

189-
---
190190

191-
## Autograding Development
191+
Note: The above commands will also apply any necessary system and
192+
database [Migrations](/developer/development_instructions/migrations).
193+
194+
195+
### Autograding Development
192196

193197
In addition to the `submitty_install` command above, if you modify an
194198
autograding configuration, you'll probably need to:
@@ -198,42 +202,6 @@ autograding configuration, you'll probably need to:
198202
* [Batch Regrade Homeworks](/instructor/batch_regrade_submissions) already submitted to those gradeables.
199203

200204

201-
---
202-
203-
## System Clock Testing & Troubleshooting
204-
205-
* If the VM has a clock skew (incorrect time)
206-
207-
```
208-
sudo service ntp stop
209-
sudo ntpd -gq
210-
sudo service ntp start
211-
```
212-
213-
214-
* If you need to test time and/or date dependent elements, you can
215-
change it in the vagrant machine so you don't have to wait. To
216-
remove the syncing and set your own time:
217-
218-
```
219-
sudo systemctl disable ntp
220-
timedatectl set-ntp 0
221-
sudo date -s "<year>-<month>-<day> <hour>:<minute>:<seconds>
222-
```
223-
224-
To check the date, helpful to make sure the date and time you set has stuck:
225-
226-
```
227-
date
228-
```
229-
230-
To sync back with the current time:
231-
232-
```
233-
sudo systemctl enable ntp
234-
timedatectl set-ntp 1
235-
```
236-
237205
---
238206

239207
## System Re-Configuration
@@ -255,16 +223,15 @@ these changes.
255223
```
256224
sudo python3 /usr/local/submitty/GIT_CHECKOUT/Submitty/.setup/update_database.py
257225
```
258-
259-
226+
260227
---
261228

262229
## Re-Creating All Sample Course Data
263-
264230
* If you've changed the script to create a new course
265231
(`create_course.sh`), or the schema for the master database
266232
(`submitty_db.sql`), or the schema for the course databases
267-
(`course_tables.sql`), we need to delete all courses, and recreate
233+
(`course_tables.sql`), or you changed student/gradeable data
234+
we need to delete all courses and recreate
268235
the course databases, users, and sample submission uploads.
269236

270237
_NOTE: Make sure you are not be connected to any DBs (e.g., through
@@ -283,8 +250,11 @@ these changes.
283250
missing the hundreds of sample student submissions present in the
284251
full installation.
285252

286-
See also: [Database Migrations](/developer/development_instructions/migrations)
287253

254+
NOTE: This command will also have to be run twice a year on July 1st and January 1st when the test semester will change from fall to spring or vice versa.
255+
256+
257+
See also: [Sample Course Data](/developer/development_instructions/sample_data)
288258

289259
---
290260

@@ -322,3 +292,23 @@ these changes.
322292
also destroy the databases, and any grading configuration or grading
323293
work that has been done._
324294

295+
---
296+
---
297+
298+
299+
## Virtual Machine Recovery using Snapshots
300+
301+
In the event of a non-recoverable error while working on Submitty the last resort is to, perform a fresh `vagrant up`. However, this process can be time-consuming. To avoid such situations and save time, it is highly recommended to take a snapshot when you first set up your Vagrant environment by following the tutorial links provided below:
302+
303+
* [Virtual Box](https://www.youtube.com/watch?v=Kl-Qc6N9znw)
304+
305+
* [VMWare](https://www.youtube.com/watch?v=DQutP_-2j3g)
306+
307+
* [Vagrant](https://developer.hashicorp.com/vagrant/docs/cli/snapshot)
308+
309+
By taking a snapshot at this initial stage, you can later revert to this saved state if needed, ensuring a quick recovery. Once you have restored the snapshot, you can then proceed with the following steps:
310+
311+
1. Launch the virtual machine using `vagrant up`.
312+
2. Access the virtual machine with `vagrant ssh`.
313+
3. Run `submitty_install` command to conduct a more complete update and reset of all of the Submitty source code.
314+

0 commit comments

Comments
 (0)