Skip to content

Commit 09ba1c4

Browse files
joelgallantjoelgallant
committed
Merge branch 'master' into feat/exec-extension
2 parents 423e371 + c18bf40 commit 09ba1c4

File tree

322 files changed

+8662
-3015
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+8662
-3015
lines changed

‎.dockerignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
**/*.tsbuildinfo
2+
**/dist/
3+
**/node_modules/
4+
5+
docs/
6+
7+
.git/
8+
.github/
9+
.gitignore
10+
.editorconfig
11+
.dockerignore
12+
Dockerfile

‎.github/workflows/cypress.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: cypress
2+
3+
on:
4+
push:
5+
branches: '*'
6+
7+
jobs:
8+
all:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- uses: actions/setup-node@v1
13+
with:
14+
node-version: 14.x
15+
- uses: bahmutov/npm-install@v1
16+
17+
- run: yarn build
18+
19+
- name: Cypress dependencies
20+
uses: cypress-io/github-action@v2
21+
with:
22+
install: true
23+
runTests: false
24+
25+
- uses: cypress-io/github-action@v2
26+
with:
27+
group: frontend-example-project-test
28+
working-directory: examples/frontend-webpack-project
29+
install: false
30+
record: true
31+
start: yarn serve -l 8080 ./dist
32+
env:
33+
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
34+
- uses: cypress-io/github-action@v2
35+
with:
36+
group: query-parameter-overrides-test
37+
working-directory: tests/webpack-projects/query-parameter-overrides
38+
install: false
39+
record: true
40+
start: yarn serve -l 8990 ./dist
41+
env:
42+
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
43+
- uses: cypress-io/github-action@v2
44+
with:
45+
group: cypress-plugin-test
46+
working-directory: tests/webpack-projects/cypress-plugin
47+
install: false
48+
record: true
49+
start: yarn serve -l 8991 ./dist
50+
env:
51+
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
52+
- uses: cypress-io/github-action@v2
53+
with:
54+
group: app-config-core-in-browser-test
55+
working-directory: tests/webpack-projects/app-config-core-in-browser
56+
install: false
57+
record: true
58+
start: yarn serve -l 8992 ./dist
59+
env:
60+
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
61+

‎.github/workflows/docker-image.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: docker-image
2+
3+
on:
4+
push:
5+
branches: 'master'
6+
tags: '*'
7+
8+
jobs:
9+
publish:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v2
14+
- uses: docker/setup-buildx-action@v1
15+
16+
- uses: docker/login-action@v1
17+
with:
18+
registry: ghcr.io
19+
username: ${{ github.repository_owner }}
20+
password: ${{ secrets.CR_PAT }}
21+
22+
- uses: docker/build-push-action@v2
23+
if: github.ref == 'refs/heads/master'
24+
with:
25+
push: true
26+
tags: |
27+
ghcr.io/launchcodedev/app-config:latest
28+
29+
- uses: olegtarasov/[email protected]
30+
id: tagName
31+
32+
- uses: docker/build-push-action@v2
33+
if: contains(github.ref, 'refs/tags/')
34+
with:
35+
push: true
36+
tags: |
37+
ghcr.io/launchcodedev/app-config:${{ steps.tagName.outputs.tag }}

‎.github/workflows/main.yml

Lines changed: 23 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -20,98 +20,35 @@ jobs:
2020
- uses: actions/setup-node@v1
2121
with:
2222
node-version: ${{ matrix.node-version }}
23-
- id: yarn-cache-dir-path
24-
run: echo "::set-output name=dir::$(yarn cache dir)"
25-
- id: yarn-cache
26-
uses: actions/cache@v2
27-
with:
28-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
29-
key: ${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}
30-
restore-keys: |
31-
${{ runner.os }}-node-${{ matrix.node-version }}-yarn-
32-
- run: yarn install --prefer-offline
23+
- uses: bahmutov/npm-install@v1
3324
- run: yarn build
3425
- run: yarn lint
3526
- run: yarn test --coverage
3627
env: { CI: 1 }
3728
- uses: codecov/codecov-action@v1
3829
with:
3930
token: ${{ secrets.CODECOV_TOKEN }}
40-
files: ./app-config/coverage/coverage-final.json,./app-config-inject/coverage/coverage-final.json,./app-config-webpack-plugin/coverage/coverage-final.json
31+
files: |
32+
./app-config-cli/coverage/coverage-final.json,
33+
./app-config-config/coverage/coverage-final.json,
34+
./app-config-core/coverage/coverage-final.json,
35+
./app-config-cypress/coverage/coverage-final.json,
36+
./app-config-default-extensions/coverage/coverage-final.json,
37+
./app-config-encryption/coverage/coverage-final.json,
38+
./app-config-extension-utils/coverage/coverage-final.json,
39+
./app-config-extensions/coverage/coverage-final.json,
40+
./app-config-generate/coverage/coverage-final.json,
41+
./app-config-git/coverage/coverage-final.json,
42+
./app-config-inject/coverage/coverage-final.json,
43+
./app-config-logging/coverage/coverage-final.json,
44+
./app-config-main/coverage/coverage-final.json,
45+
./app-config-meta/coverage/coverage-final.json,
46+
./app-config-node/coverage/coverage-final.json,
47+
./app-config-schema/coverage/coverage-final.json,
48+
./app-config-settings/coverage/coverage-final.json,
49+
./app-config-utils/coverage/coverage-final.json,
50+
./app-config-v1-compat/coverage/coverage-final.json,
51+
./app-config-vault/coverage/coverage-final.json,
52+
./app-config-webpack-plugin/coverage/coverage-final.json,
4153
fail_ci_if_error: true
4254
verbose: true
43-
44-
# for master, we test Linux & Windows & MacOS + Node LTS & Latest
45-
# note that we don't do linting here, only on Linux + Node LTS (above)
46-
all:
47-
if: github.ref == 'refs/heads/master'
48-
49-
strategy:
50-
matrix:
51-
os:
52-
- ubuntu-latest
53-
- macos-latest
54-
- windows-latest
55-
node-version: [10.x, 12.x, 14.x, 15.x]
56-
57-
runs-on: ${{ matrix.os }}
58-
steps:
59-
- uses: actions/checkout@v2
60-
- uses: actions/setup-node@v1
61-
with:
62-
node-version: ${{ matrix.node-version }}
63-
- id: yarn-cache-dir-path
64-
run: echo "::set-output name=dir::$(yarn cache dir)"
65-
- id: yarn-cache
66-
uses: actions/cache@v2
67-
with:
68-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
69-
key: ${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}
70-
restore-keys: |
71-
${{ runner.os }}-node-${{ matrix.node-version }}-yarn-
72-
- run: yarn install --prefer-offline
73-
- run: yarn build
74-
- run: yarn test --testTimeout 20000
75-
env: { CI: 1 }
76-
77-
cypress:
78-
runs-on: ubuntu-latest
79-
steps:
80-
- uses: actions/checkout@v2
81-
- uses: actions/setup-node@v1
82-
with:
83-
node-version: 14.x
84-
- id: yarn-cache-dir-path
85-
run: echo "::set-output name=dir::$(yarn cache dir)"
86-
- id: yarn-cache
87-
uses: actions/cache@v2
88-
with:
89-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
90-
key: ${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}
91-
restore-keys: |
92-
${{ runner.os }}-node-${{ matrix.node-version }}-yarn-
93-
- run: yarn install --prefer-offline
94-
- run: yarn build
95-
- name: Cypress dependencies
96-
uses: cypress-io/github-action@v2
97-
with:
98-
install: true
99-
runTests: false
100-
- uses: cypress-io/github-action@v2
101-
with:
102-
group: frontend-example-project-test
103-
working-directory: examples/frontend-webpack-project
104-
install: false
105-
record: true
106-
start: yarn serve -l 8080 ./dist
107-
env:
108-
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
109-
- uses: cypress-io/github-action@v2
110-
with:
111-
group: query-parameter-overrides-test
112-
working-directory: tests/webpack-projects/query-parameter-overrides
113-
install: false
114-
record: true
115-
start: yarn serve -l 8990 ./dist
116-
env:
117-
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

‎.github/workflows/multi-platform.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: multi-platform
2+
3+
on:
4+
push:
5+
branches: 'master'
6+
7+
jobs:
8+
# for master, we test Linux & Windows & MacOS + Node LTS & Latest
9+
# note that we don't do linting here, only on Linux + Node LTS
10+
all:
11+
strategy:
12+
matrix:
13+
os:
14+
- ubuntu-latest
15+
- macos-latest
16+
- windows-latest
17+
node-version: [10.x, 12.x, 14.x, 15.x]
18+
19+
runs-on: ${{ matrix.os }}
20+
steps:
21+
- uses: actions/checkout@v2
22+
- uses: actions/setup-node@v1
23+
with:
24+
node-version: ${{ matrix.node-version }}
25+
- uses: bahmutov/npm-install@v1
26+
27+
- run: yarn build
28+
- run: yarn test --testTimeout 20000
29+
env: { CI: 1 }

0 commit comments

Comments
 (0)