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

chore(manager): move the manager and rename the repository to outline_apps #1834

Merged
merged 15 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build and Test
name: Build and Test / Client

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

on:
Expand All @@ -26,11 +26,12 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: npm
cache-dependency-path: ./package-lock.json

- name: Install NPM Dependencies
run: npm ci
run: npm set cache .npm && npm ci

- name: Run Linter
run: npm run action lint
Expand Down Expand Up @@ -58,8 +59,9 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: npm
cache-dependency-path: ./package-lock.json

- name: Install NPM Dependencies
run: npm ci
Expand Down Expand Up @@ -87,8 +89,9 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: npm
cache-dependency-path: ./package-lock.json

- name: Install NPM Dependencies
run: npm ci
Expand Down Expand Up @@ -116,8 +119,9 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: npm
cache-dependency-path: ./package-lock.json

- name: Install NPM Dependencies
run: npm ci
Expand Down Expand Up @@ -157,8 +161,9 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: npm
cache-dependency-path: ./package-lock.json

- name: Install NPM Dependencies
run: npm ci
Expand Down Expand Up @@ -198,8 +203,9 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: npm
cache-dependency-path: ./package-lock.json

- name: Install NPM Dependencies
run: npm ci
Expand Down Expand Up @@ -236,8 +242,9 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: npm
cache-dependency-path: ./package-lock.json

- name: Install NPM Dependencies
run: npm ci
Expand Down
129 changes: 129 additions & 0 deletions .github/workflows/build_and_test_debug_manager.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
name: Build and Test / Manager

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

on:
pull_request:
types:
- opened
- synchronize
push:
branches:
- master

jobs:
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/[email protected]

- name: Install Node
uses: actions/setup-node@v3
with:
node-version-file: .nvmrc
cache: npm
cache-dependency-path: ./server_manager/package.json

- name: Install NPM Dependencies
run: npm ci

- name: Lint
run: npm run lint

web_test:
name: Web Test
runs-on: ubuntu-latest
needs: lint
steps:
- name: Checkout
uses: actions/[email protected]

- name: Install Node
uses: actions/setup-node@v3
with:
node-version-file: .nvmrc
cache: npm
cache-dependency-path: ./server_manager/package.json

- name: Install NPM Dependencies
run: npm ci

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

linux_debug_build:
name: Linux Debug Build
runs-on: ubuntu-latest
needs: web_test
env:
SENTRY_DSN: debug
steps:
- name: Checkout
uses: actions/[email protected]

- name: Install Node
uses: actions/setup-node@v3
with:
node-version-file: .nvmrc
cache: npm
cache-dependency-path: ./server_manager/package.json

- name: Install NPM Dependencies
run: npm ci

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

windows_debug_build:
name: Windows Debug Build
# TODO(daniellacosse): port bash scripts to windows so we can build the manager on windows
runs-on: ubuntu-latest
needs: web_test
env:
SENTRY_DSN: debug
steps:
- name: Checkout
uses: actions/[email protected]

- name: Install Node
uses: actions/setup-node@v3
with:
node-version-file: .nvmrc
cache: npm
cache-dependency-path: ./server_manager/package.json

- name: Install NPM Dependencies
run: npm ci

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

mac_debug_build:
name: MacOS Debug Build
runs-on: macos-11
needs: web_test
env:
SENTRY_DSN: debug
steps:
- name: Checkout
uses: actions/[email protected]

- name: Install Node
uses: actions/setup-node@v3
with:
node-version-file: .nvmrc
cache: npm
cache-dependency-path: ./server_manager/package.json

- 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 macos
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*.pdb
*.sw?
/node_modules
/server_manager/node_modules
/build
/output
/platforms
Expand All @@ -26,3 +27,5 @@ tools/smartdnsblock/bin/*
!tools/smartdnsblock/bin/*.exe
universal.apk
xcuserdata/
do_install_script.ts
Copy link
Collaborator

@fortuna fortuna Feb 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this in the root?

I'd rather keep the .gitignore localized in the respective folder. Create the file there instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you omit the slash, it ignores anything called do_install_script.ts - I'll make it more specific

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please create a .gitignore in the directory where do_install_script.ts is created, so it's localized there.
I'd say same for /server_manager to ignore the node_modules.

It's easier to manage these if they are in context.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I prefer that, even

gcp_install_script.ts
27 changes: 18 additions & 9 deletions commitlint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,30 @@ module.exports = {
'always',
[
'build',
'cordova',
'cordova/android',
'cordova/apple',
'cordova/apple/ios',
'cordova/apple/macos',
'client/cordova',
'client/cordova/android',
'client/cordova/apple',
'client/cordova/apple/ios',
'client/cordova/apple/macos',
'client/electron',
'client/electron/linux',
'client/electron/windows',
'devtools',
'docs',
'electron',
'electron/linux',
'electron/windows',
'www',
'manager',
'manager/linux',
'manager/mac',
'manager/windows',
'service',
'service/linux',
'service/windows',
'www',
],
],
'type-enum': [
2,
'always',
['build', 'chore', 'ci', 'docs', 'feat', 'fix', 'perf', 'proposal', 'refactor', 'revert', 'style', 'test'],
],
},
};
Loading
Loading