Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rocket 0.5 #33

Draft
wants to merge 45 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
8709851
Update deps for rocket 0.5
threecgreen Feb 22, 2021
5944db0
Start on required changes
threecgreen Feb 23, 2021
f9bcc11
More async switches
threecgreen Feb 19, 2021
9936499
Small fixes
threecgreen Feb 23, 2021
a054cd9
More async changes
threecgreen Feb 28, 2021
0217bca
App compiling and launching
threecgreen Mar 1, 2021
ef6a17d
Start on fixing tests
threecgreen Mar 1, 2021
153e52b
Update most tests for async
threecgreen Mar 2, 2021
bcfb5c9
dependency bump
threecgreen Mar 3, 2021
c632205
Switch to stable rust
threecgreen Mar 3, 2021
8efa057
Add await to testing lock
threecgreen Mar 3, 2021
895203b
Task updates
threecgreen Mar 3, 2021
2189126
Fix crashing tests
threecgreen Mar 3, 2021
1c5f79d
Implement user handler tests
threecgreen Mar 4, 2021
ec0d963
Update rocket
threecgreen Mar 6, 2021
2c14be3
Add new user test
threecgreen Mar 6, 2021
9182d63
New user with bad password test
threecgreen Mar 6, 2021
6957e36
Fix last ignored test
threecgreen Mar 6, 2021
cf35675
Merge branch 'master' into rocket-0.5
threecgreen Jun 9, 2021
1c792bb
Build fixes for rocket-0.5.0-rc.1
threecgreen Jun 9, 2021
2a36084
Update deps
threecgreen Oct 30, 2021
1a2bd38
Add weekly ci run
threecgreen Oct 30, 2021
cdd8742
Add audit step
threecgreen Oct 30, 2021
4fd93fc
Switch to better-npm-audit for ignore list
threecgreen Oct 30, 2021
74203e2
Update deps
threecgreen Dec 10, 2021
46b683f
Fix a few more build errors
threecgreen Dec 10, 2021
cb00bd4
Code compiles with rocket 0.5
threecgreen Dec 10, 2021
034cba1
Tests compile with rocket 0.5
threecgreen Dec 10, 2021
f6dff3d
Merge branch 'development' into rocket-0.5
threecgreen Dec 11, 2021
4e5c456
Clippy fixes
threecgreen Dec 11, 2021
4be8fa1
Fix dependency audit
threecgreen Dec 11, 2021
b8d4b49
Fix cached static paths
threecgreen Dec 11, 2021
4d9ba7b
Fix rocket launch
threecgreen Dec 11, 2021
6144e95
Switch back to nightly for better error messages
threecgreen May 24, 2022
be8ff5e
Upgrade to rc 2
threecgreen May 24, 2022
1af741e
Upgrade deps to fix diesel issue
threecgreen May 24, 2022
fc70e2a
Merge upstream changes
threecgreen May 24, 2022
ff25a26
Remove specific toolchain
threecgreen May 24, 2022
421a575
Fix clippy lint
threecgreen May 24, 2022
6c08a0a
Fix clippy in CI
threecgreen May 24, 2022
0fd37c5
Update MaterializeCSS audit ignore
threecgreen May 24, 2022
281eb29
Add changelog
threecgreen May 24, 2022
94297b4
async-ify cached_static
threecgreen May 24, 2022
029a0f2
Merge master
threecgreen Jun 20, 2022
34124b3
Update to Rocket 0.5.1
threecgreen Jun 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: CI

on: [push]

on:
push:
env:
CARGO_TERM_COLOR: always
FORCE_COLOR: true
Expand All @@ -28,7 +28,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Install nightly
- name: Install nightly and clippy
uses: actions-rs/toolchain@v1
with:
profile: minimal
Expand Down Expand Up @@ -71,6 +71,10 @@ jobs:
with:
command: run
args: --bin gen_contracts
- name: Install NPM
uses: actions/setup-node@v3
with:
node-version: 18.3
- name: Install
run: npm ci --dev
- name: Build
Expand Down
29 changes: 9 additions & 20 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Tslint",
"type": "shell",
"command": "${workspaceFolder}/scripts/lint.sh",
"args": [
"typescript"
],
"group": "test",
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "dedicated",
"showReuseMessage": false
}
},
{
"type": "npm",
"script": "watch",
Expand Down Expand Up @@ -54,6 +38,11 @@
"script": "analyze-bundle",
"path": "web/",
"problemMatcher": []
},{
"type": "npm",
"script": "test",
"path": "web/",
"problemMatcher": []
},
{
"label": "generate contracts",
Expand Down Expand Up @@ -98,10 +87,10 @@
}
},
{
"label": "build",
"type": "shell",
"command": "cargo",
"args": ["build"],
"label": "build server",
"type": "cargo",
"command": "build",
"args": [],
"group": "build",
"problemMatcher": "$rustc",
"presentation": {
Expand Down
Loading
Loading