Skip to content

Commit

Permalink
Merge branch 'master' into daniellacosse/provider_message_and_contact
Browse files Browse the repository at this point in the history
  • Loading branch information
daniellacosse authored Mar 6, 2024
2 parents 69bdfd7 + 8db4ec9 commit fefa87e
Show file tree
Hide file tree
Showing 275 changed files with 68,321 additions and 6,851 deletions.
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,9 @@
*.pdb
*.sw?
/node_modules
/server_manager/node_modules
/server_manager/do_install_script.ts
/server_manager/gcp_install_script.ts
/build
/output
/platforms
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $(BUILDDIR)/android/tun2socks.aar: $(GOMOBILE)

$(BUILDDIR)/ios/Tun2socks.xcframework: $(GOMOBILE)
# -iosversion should match what outline-client supports.
$(GOBIND) -iosversion=11.0 -target=ios,iossimulator -o $@ -ldflags '-w' -bundleid org.outline.tun2socks $(IMPORT_PATH)/$(ROOT_PKG)/outline/tun2socks $(IMPORT_PATH)/$(ROOT_PKG)/outline/shadowsocks
$(GOBIND) -iosversion=12.0 -target=ios,iossimulator -o $@ -ldflags '-w' -bundleid org.outline.tun2socks $(IMPORT_PATH)/$(ROOT_PKG)/outline/tun2socks $(IMPORT_PATH)/$(ROOT_PKG)/outline/shadowsocks

$(BUILDDIR)/macos/Tun2socks.xcframework: $(GOMOBILE)
# MACOSX_DEPLOYMENT_TARGET and -iosversion should match what outline-client supports.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Outline Client

![Build and Test](https://github.com/Jigsaw-Code/outline-client/actions/workflows/build_and_test_debug.yml/badge.svg?branch=master) [![Mattermost](https://badgen.net/badge/Mattermost/Outline%20Community/blue)](https://community.internetfreedomfestival.org/community/channels/outline-community) [![Reddit](https://badgen.net/badge/Reddit/r%2Foutlinevpn/orange)](https://www.reddit.com/r/outlinevpn/)
![Build and Test](https://github.com/Jigsaw-Code/outline-client/actions/workflows/build_and_test_debug_client.yml/badge.svg?branch=master) [![Mattermost](https://badgen.net/badge/Mattermost/Outline%20Community/blue)](https://community.internetfreedomfestival.org/community/channels/outline-community) [![Reddit](https://badgen.net/badge/Reddit/r%2Foutlinevpn/orange)](https://www.reddit.com/r/outlinevpn/)

> **Test coverage currently only tracks the Apple Libraries and core web view code:**
>
Expand Down
22 changes: 13 additions & 9 deletions commitlint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,24 @@ 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': [
Expand Down
Loading

0 comments on commit fefa87e

Please sign in to comment.