Skip to content

Commit

Permalink
Merge branch 'main' into cpp-logging
Browse files Browse the repository at this point in the history
  • Loading branch information
erlingrj authored Oct 14, 2023
2 parents ff39ba4 + dd3c480 commit 38d2aa0
Show file tree
Hide file tree
Showing 419 changed files with 13,489 additions and 17,167 deletions.
9 changes: 4 additions & 5 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"name": "TypeScript Website codespace",
"name": "Lingua Franca Website codespace",
"dockerFile": "Dockerfile",

// Set *default* container specific settings.json values on container create.
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},

"forwardPorts": [8000],

"forwardPorts": [
8000
],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "sudo yarn install && sudo yarn bootstrap && yarn start"
}
7 changes: 7 additions & 0 deletions .github/workflows/deploy-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ jobs:
env:
YARN_CHECKSUM_BEHAVIOR: ignore

# Checks for known security vulnerabilities
- uses: GuillaumeFalourd/assert-command-line-output@v2
with:
command_line: yarn npm audit
contains: No audit suggestions
expected_result: PASSED

# Deploy to lf-lang.org
- name: Deploy + Publish to GitHub Pages
uses: peaceiris/[email protected]
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ pids
*.seed
*.pid.lock

# Project files
.project

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

Expand Down
3 changes: 1 addition & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"recommendations": [
"esbenp.prettier-vscode",
"Orta.vscode-twoslash"
"esbenp.prettier-vscode"
]
}
24 changes: 0 additions & 24 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,5 @@
},
"typescript.tsdk": "node_modules/typescript/lib",
"editor.formatOnSave": true,
"deno.enable": false,
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#5592d5",
"activityBar.activeBorder": "#f2ccde",
"activityBar.background": "#5592d5",
"activityBar.foreground": "#15202b",
"activityBar.inactiveForeground": "#15202b99",
"activityBarBadge.background": "#f2ccde",
"activityBarBadge.foreground": "#15202b",
"editorGroup.border": "#5592d5",
"panel.border": "#5592d5",
"sash.hoverBorder": "#5592d5",
"sideBar.border": "#5592d5",
"statusBar.background": "#3178c6",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#5592d5",
"statusBarItem.remoteBackground": "#3178c6",
"statusBarItem.remoteForeground": "#e7e7e7",
"titleBar.activeBackground": "#3178c6",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#3178c699",
"titleBar.inactiveForeground": "#e7e7e799"
},
"peacock.color": "#3178C6",
"editor.tabSize": 2,
}
3 changes: 0 additions & 3 deletions docs/README.md

This file was deleted.

4 changes: 2 additions & 2 deletions img/header_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/intellij/expand_gradle_tab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/intellij/gradle_import.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed img/intellij/import_gradle_project.png
Binary file not shown.
Binary file removed img/intellij/open_project.png
Binary file not shown.
Binary file modified img/intellij/run_config_lf_program.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed img/intellij/startup_screen.png
Binary file not shown.
128 changes: 128 additions & 0 deletions img/small_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/tracing/Feedback.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 38d2aa0

Please sign in to comment.