Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
65beb09
feat(ssl): add certs
gregoranders Jun 19, 2020
e09483a
feat(ssl): fix build
gregoranders Jun 19, 2020
b30f2b4
feat(ssl): fix build
gregoranders Jun 19, 2020
3159bb8
feat(ssl): fix build
gregoranders Jun 19, 2020
7221531
feat(ssl): fix build
gregoranders Jun 19, 2020
cd83ca8
build(ssl): fix build on macos
gregoranders Jun 19, 2020
8e2eae8
build(ssl): fix build on macos and windows
gregoranders Jun 19, 2020
76d2ccb
build(ssl): fix build on macos and windows
gregoranders Jun 19, 2020
8e51c66
build(ssl): fix build on macos and windows
gregoranders Jun 19, 2020
9e052e7
build(ssl): fix build on macos and windows
gregoranders Jun 19, 2020
10bc98f
build(ssl): fix build on macos and windows
gregoranders Jun 19, 2020
99d3bbe
build(ssl): fix build on macos and windows
gregoranders Jun 19, 2020
70cbe9a
build(ssl): fix build on macos
gregoranders Jun 19, 2020
94abb4e
build(ssl): fix build on macos
gregoranders Jun 19, 2020
45859f7
build(ssl): fix build on macos
gregoranders Jun 19, 2020
406200a
build(ssl): fix build on macos
gregoranders Jun 19, 2020
36948f4
build(ssl): fix build on macos
gregoranders Jun 19, 2020
95b1325
build(ssl): fix build on macos
gregoranders Jun 19, 2020
51c654c
build(ssl): fix build on macos
gregoranders Jun 19, 2020
5b18bcd
build(ssl): fix build on macos
gregoranders Jun 19, 2020
1c5e8f6
build(ssl): fix build on macos
gregoranders Jun 19, 2020
804681a
build(ssl): fix build on macos
gregoranders Jun 19, 2020
cae78a6
build(ssl): fix build on macos
gregoranders Jun 19, 2020
86aa6f9
build(ssl): fix build on macos
gregoranders Jun 19, 2020
7496476
build(ssl): fix build on macos
gregoranders Jun 19, 2020
7951ac9
build(ssl): fix build on macos
gregoranders Jun 19, 2020
e8ce8bc
build(ssl): fix build on macos
gregoranders Jun 19, 2020
0139912
build(ssl): fix build on macos
gregoranders Jun 19, 2020
0fd5ce2
build(ssl): fix build on macos
gregoranders Jun 19, 2020
d62a557
build(ssl): fix build on macos
gregoranders Jun 19, 2020
3d0f21b
build(ssl): update build configuration
gregoranders Jun 19, 2020
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
40 changes: 24 additions & 16 deletions .github/workflows/development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ on:
branches:
- development

env:
CI: true
HEADLESS: true
GITHUB_BRANCH: ${{ github.ref }}
GITHUB_COMMIT: ${{ github.sha }}

jobs:
build:
runs-on: ${{ matrix.os }}
Expand All @@ -29,49 +35,51 @@ jobs:
- name: npm install
run: |
npm install
env:
CI: true
- name: npm run build
run: |
npm run build
env:
CI: true
- name: npm test
run: |
npm test
env:
CI: true
- name: code coverage
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: ./test/coverage/lcov.info
env:
CI: true
- name: npm run e2e
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
run: |
sudo apt-get update
sudo apt-get install xvfb
sudo apt-get install ca-certificates libnss3-tools xvfb
sudo mkdir -pv /usr/local/share/ca-certificates
sudo cp -v ssl/fritz.box.crt /usr/local/share/ca-certificates/
sudo chmod 644 /usr/local/share/ca-certificates/*
sudo update-ca-certificates
mkdir -pv ${HOME}/.pki/nssdb
echo > .password
certutil -N -d sql:${HOME}/.pki/nssdb -f .password
certutil -A -d sql:${HOME}/.pki/nssdb -f .password -t "C,," -n "fritz.box" -i ssl/fritz.box.crt
rm -rf .password
xvfb-run --auto-servernum -- bash -c "npm run e2e"
env:
HEADLESS: true
GITHUB_BRANCH: ${{ github.ref }}
GITHUB_COMMIT: ${{ github.sha }}
PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
- name: npm run e2e
if: matrix.os == 'macos-latest' && matrix.node-version == '14.x'
run: |
sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.Keychain ssl/fritz.box.crt
npm run e2e
env:
HEADLESS: true
GITHUB_BRANCH: ${{ github.ref }}
GITHUB_COMMIT: ${{ github.sha }}
PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
- name: npm run e2e
if: matrix.os == 'windows-latest' && matrix.node-version == '14.x'
run: |
certutil -addstore -f "ROOT" ssl\fritz.box.crt
env:
PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
- name: archive e2e screenshots
uses: actions/upload-artifact@v1
if: ( matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' ) && matrix.node-version == '14.x'
if: matrix.node-version == '14.x'
with:
name: Screenshots Development ${{ matrix.os }} ${{ matrix.node-version }}
path: e2e/screenshots
44 changes: 33 additions & 11 deletions .github/workflows/feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,19 @@ on:
branches:
- feature/*

env:
CI: true
HEADLESS: true
GITHUB_BRANCH: ${{ github.ref }}
GITHUB_COMMIT: ${{ github.sha }}

jobs:
build:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [14.x]

steps:
Expand All @@ -29,30 +35,46 @@ jobs:
- name: npm install
run: |
npm install
env:
CI: true
- name: npm run build
run: |
npm run build
env:
CI: true
- name: npm test
run: |
npm test
env:
CI: true
- name: npm run e2e
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
run: |
sudo apt-get update
sudo apt-get install xvfb
sudo apt-get install ca-certificates libnss3-tools xvfb
sudo mkdir -pv /usr/local/share/ca-certificates
sudo cp -v ssl/fritz.box.crt /usr/local/share/ca-certificates/
sudo chmod 644 /usr/local/share/ca-certificates/*
sudo update-ca-certificates
mkdir -pv ${HOME}/.pki/nssdb
echo > .password
certutil -N -d sql:${HOME}/.pki/nssdb -f .password
certutil -A -d sql:${HOME}/.pki/nssdb -f .password -t "C,," -n "fritz.box" -i ssl/fritz.box.crt
rm -rf .password
xvfb-run --auto-servernum -- bash -c "npm run e2e"
env:
HEADLESS: true
GITHUB_BRANCH: ${{ github.ref }}
GITHUB_COMMIT: ${{ github.sha }}
PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
- name: npm run e2e
if: matrix.os == 'macos-latest' && matrix.node-version == '14.x'
run: |
sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.Keychain ssl/fritz.box.crt
npm run e2e
env:
PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
- name: npm run e2e
if: matrix.os == 'windows-latest' && matrix.node-version == '14.x'
run: |
certutil -addstore -f "ROOT" ssl\fritz.box.crt
npm run e2e
env:
PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
- name: archive e2e screenshots
uses: actions/upload-artifact@v1
if: matrix.node-version == '14.x'
with:
name: Screenshots Feature ${{ matrix.os }} ${{ matrix.node-version }}
path: e2e/screenshots
43 changes: 25 additions & 18 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ on:
branches:
- master

env:
CI: true
HEADLESS: true
GITHUB_BRANCH: ${{ github.ref }}
GITHUB_COMMIT: ${{ github.sha }}

jobs:
build:
runs-on: ${{ matrix.os }}
Expand All @@ -29,31 +35,22 @@ jobs:
- name: npm install
run: |
npm install
env:
CI: true
- name: npm run build
run: |
npm run build
env:
CI: true
- name: npm test
run: |
npm test
env:
CI: true
- name: code coverage
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: ./test/coverage/lcov.info
env:
CI: true
- name: publish code coverage to code climate
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
uses: paambaati/codeclimate-action@v2.6.0
env:
CI: true
CC_TEST_REPORTER_ID: ${{ secrets.CODE_CLIMATE }}
with:
coverageCommand: npm run test
Expand All @@ -64,25 +61,36 @@ jobs:
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
run: |
sudo apt-get update
sudo apt-get install xvfb
sudo apt-get install ca-certificates libnss3-tools xvfb
sudo mkdir -pv /usr/local/share/ca-certificates
sudo cp -v ssl/fritz.box.crt /usr/local/share/ca-certificates/
sudo chmod 644 /usr/local/share/ca-certificates/*
sudo update-ca-certificates
mkdir -pv ${HOME}/.pki/nssdb
echo > .password
certutil -N -d sql:${HOME}/.pki/nssdb -f .password
certutil -A -d sql:${HOME}/.pki/nssdb -f .password -t "C,," -n "fritz.box" -i ssl/fritz.box.crt
rm -rf .password
xvfb-run --auto-servernum -- bash -c "npm run e2e"
env:
HEADLESS: true
GITHUB_BRANCH: ${{ github.ref }}
GITHUB_COMMIT: ${{ github.sha }}
PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
- name: npm run e2e
if: matrix.os == 'macos-latest' && matrix.node-version == '14.x'
run: |
sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.Keychain ssl/fritz.box.crt
npm run e2e
env:
PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
- name: npm run e2e
if: matrix.os == 'windows-latest' && matrix.node-version == '14.x'
run: |
certutil -addstore -f "ROOT" ssl\fritz.box.crt
npm run e2e
env:
HEADLESS: true
GITHUB_BRANCH: ${{ github.ref }}
GITHUB_COMMIT: ${{ github.sha }}
PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
- name: archive e2e screenshots
uses: actions/upload-artifact@v1
if: ( matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' ) && matrix.node-version == '14.x'
if: matrix.node-version == '14.x'
with:
name: Screenshots Master ${{ matrix.os }} ${{ matrix.node-version }}
path: e2e/screenshots
Expand All @@ -91,7 +99,6 @@ jobs:
id: createrelease
uses: gregoranders/nodejs-create-release@v0.0.6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
with:
tag: v${{ steps.projectinfo.outputs.version }}
Expand Down
25 changes: 16 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ on:
types:
- edited

env:
CI: true
HEADLESS: true
GITHUB_BRANCH: ${{ github.ref }}
GITHUB_COMMIT: ${{ github.sha }}

jobs:
build:
runs-on: ${{ matrix.os }}
Expand All @@ -29,26 +35,27 @@ jobs:
- name: npm install
run: |
npm install
env:
CI: true
- name: npm run build
run: |
npm run build
env:
CI: true
- name: npm test
run: |
npm test
env:
CI: true
- name: npm run e2e
run: |
sudo apt-get update
sudo apt-get install xvfb
sudo apt-get install ca-certificates libnss3-tools xvfb
sudo mkdir -pv /usr/local/share/ca-certificates
sudo cp -v ssl/fritz.box.crt /usr/local/share/ca-certificates/
sudo chmod 644 /usr/local/share/ca-certificates/*
sudo update-ca-certificates
mkdir -pv ${HOME}/.pki/nssdb
echo > .password
certutil -N -d sql:${HOME}/.pki/nssdb -f .password
certutil -A -d sql:${HOME}/.pki/nssdb -f .password -t "C,," -n "fritz.box" -i ssl/fritz.box.crt
rm -rf .password
xvfb-run --auto-servernum -- bash -c "npm run e2e"
env:
GITHUB_BRANCH: ${{ github.ref }}
GITHUB_COMMIT: ${{ github.sha }}
PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
- name: archive e2e screenshots
uses: actions/upload-artifact@v1
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM alpine:latest

COPY ./docker/docker-entrypoint.sh ./docker/docker-cmd.sh \
./docker/docker-healthcheck.sh \
./docker/fritz.box.crt ./docker/fritz.box.pem \
./docker/development.fritz.box.crt ./docker/development.fritz.box.key /
./ssl/fritz.box.crt ./ssl/fritz.box.pem \
./ssl/development.fritz.box.crt ./ssl/development.fritz.box.key /

COPY ./docker/nginx.conf /etc/nginx/nginx.conf

Expand Down
Loading