Skip to content

Commit

Permalink
Merge branch 'Jigsaw-Code:master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
nmcc1212 authored Mar 15, 2022
2 parents 8ec1892 + b56d47e commit 467f0b3
Show file tree
Hide file tree
Showing 171 changed files with 7,099 additions and 4,499 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
root = true

[*]
charset = utf-8
indent_size = 2
indent_style = space
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/build/
node_modules/
58 changes: 58 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"env": {
"browser": true,
"es2021": true,
"node": true
},
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["@typescript-eslint"],
"rules": {
"no-prototype-builtins": "off",
"@typescript-eslint/ban-types": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-explicit-any": "error",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-unused-vars": [
"warn",
{
"argsIgnorePattern": "^_"
}
]
},
"overrides": [
{
"files": [
"check-version-tracker.js",
"rollup-common.js",
"rollup.config.js",
"web-test-runner.config.js"
],
"env": {
"node": true
}
},
{
"files": ["packages/lit-html/src/test/version-stability_test.js"],
"env": {
"mocha": true
}
},
{
"files": [
"*_test.ts",
"packages/labs/ssr/custom_typings/node.d.ts",
"packages/labs/ssr/src/test/integration/tests/**",
"packages/labs/ssr/src/lib/util/parse5-utils.ts"
],
"rules": {
"@typescript-eslint/no-explicit-any": "off"
}
}
]
}
1 change: 1 addition & 0 deletions .gitallowed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
946220775492-a5v6bsdin6o7ncnqn34snuatmrp7dqh0.apps.googleusercontent.com
190 changes: 190 additions & 0 deletions .github/workflows/build_and_test_debug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
name: Build and Test

concurrency:
group: ${{ github.head_ref || github.ref }}
cancel-in-progress: true

on:
pull_request:
types:
- opened
- synchronize

jobs:
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.3.4

- name: Install Node
uses: actions/setup-node@v2.2.0
with:
node-version: 16
cache: npm

- name: Install NPM Dependencies
run: npm ci

- name: Lint
run: npm run lint

shadowbox:
name: Shadowbox
runs-on: ubuntu-latest
needs: lint
steps:
- name: Checkout
uses: actions/checkout@v2.3.4

- name: Install Node
uses: actions/setup-node@v2.2.0
with:
node-version: 16
cache: npm

- name: Install NPM Dependencies
run: npm ci

- name: Shadowbox Debug Build
run: npm run action shadowbox/server/build

- name: Shadowbox Unit Test
run: npm run action shadowbox/test

- name: Shadowbox Integration Test
run: npm run action shadowbox/integration_test/run

metrics-server:
name: Metrics Server
runs-on: ubuntu-latest
needs: lint
steps:
- name: Checkout
uses: actions/checkout@v2.3.4

- name: Install Node
uses: actions/setup-node@v2.2.0
with:
node-version: 16
cache: npm

- name: Install NPM Dependencies
run: npm ci

- name: Metrics Server Debug Build
run: npm run action metrics_server/build

- name: Metrics Server Test
run: npm run action metrics_server/test

manager-web-test:
name: Manager Web Test
runs-on: ubuntu-latest
needs: lint
steps:
- name: Checkout
uses: actions/checkout@v2.3.4

- name: Install Node
uses: actions/setup-node@v2.2.0
with:
node-version: 16
cache: npm

- name: Install NPM Dependencies
run: npm ci

- name: Manager Web Test
run: npm run action server_manager/test

manager-linux-debug-build:
name: Manager Linux Debug Build
runs-on: ubuntu-latest
needs: manager-web-test
env:
SENTRY_DSN: debug
steps:
- name: Checkout
uses: actions/checkout@v2.3.4

- name: Install Node
uses: actions/setup-node@v2.2.0
with:
node-version: 16
cache: npm

- name: Install NPM Dependencies
run: npm ci

- name: Build Linux Manager
run: npm run action server_manager/electron_app/build --platform linux

- name: Upload Linux Client
uses: actions/upload-artifact@v2
with:
name: manager_linux_debug
path: build/server_manager/electron_app/static/dist/Outline-Manager.AppImage
if-no-files-found: error

manager-windows-debug-build:
name: Manager Windows Debug Build
runs-on: windows-2019
needs: manager-web-test
env:
SENTRY_DSN: debug
steps:
- name: Checkout
uses: actions/checkout@v2.3.4

- name: Install Node
uses: actions/setup-node@v2.2.0
with:
node-version: 16
cache: npm

- name: Install NPM Dependencies
run: npm ci

- name: Build Windows Manager
run: npm run action server_manager/electron_app/build --platform windows

- name: Upload Windows Manager
uses: actions/upload-artifact@v2
with:
name: manager_windows_debug
path: build/server_manager/electron_app/static/dist/Outline-Manager.exe
if-no-files-found: error

manager-mac-debug-build:
name: Manager MacOS Debug Build
runs-on: macos-11
needs: manager-web-test
env:
SENTRY_DSN: debug
steps:
- name: Checkout
uses: actions/checkout@v2.3.4

- name: Install Node
uses: actions/setup-node@v2.2.0
with:
node-version: 16
cache: npm

- name: Install NPM Dependencies
run: npm ci

- name: Set XCode Version
run: sudo xcode-select -switch /Applications/Xcode_13.2.app

- name: Build MacOS Manager
run: npm run action server_manager/electron_app/build --platform mac

- name: Upload MacOS Manager
uses: actions/upload-artifact@v2
with:
name: manager_macos_debug
path: build/server_manager/electron_app/static/dist/Outline-Manager.dmg
if-no-files-found: error
16 changes: 16 additions & 0 deletions .github/workflows/build_release_candidates.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Build Release Candidates

concurrency:
group: ${{ github.head_ref || github.ref }}
cancel-in-progress: true

on:
push:
branches:
- master

jobs:
linux:
uses: ./.github/workflows/manager_linux_build_release_candidate.yml
secrets:
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
37 changes: 37 additions & 0 deletions .github/workflows/manager_linux_build_release_candidate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Build Linux Release Candidate

on:
workflow_call:
secrets:
SENTRY_DSN:
required: true

jobs:
manager-linux-release-build:
name: Manager Linux Release Build
runs-on: ubuntu-latest
timeout-minutes: 10
env:
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
BUILD_ENV: production
steps:
- name: Checkout
uses: actions/checkout@v2.3.4

- name: Install Node
uses: actions/setup-node@v2.2.0
with:
node-version: 16

- name: Install NPM Dependencies
run: npm ci

- name: Build Linux Release Candidate
run: npm run action server_manager/electron_app/build linux -- --buildMode=release

- name: Upload Linux Release Candidate
uses: actions/upload-artifact@v2
with:
name: manager_linux_release_${{ github.sha }}
path: build/server_manager/electron_app/static/dist
if-no-files-found: error
Loading

0 comments on commit 467f0b3

Please sign in to comment.