Skip to content

Commit 948a042

Browse files
xbill82xbill82
committed
Merge branch 'master' into 7-dev
2 parents 0619b2d + 7cf06a5 commit 948a042

File tree

4 files changed

+1297
-2627
lines changed

4 files changed

+1297
-2627
lines changed

‎.github/workflows/push_dev.workflow.yml‎

Lines changed: 69 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Deployment Doc Dev
1+
name: Push to dev branch
22

33
on:
44
push:
@@ -28,51 +28,51 @@ jobs:
2828
- uses: ./.github/actions/es-lint
2929

3030
unit-tests:
31-
name: Unit Tests
32-
runs-on: ubuntu-18.04
33-
needs: [lint]
34-
steps:
35-
- uses: actions/checkout@v2
36-
- name: Cache node modules
37-
uses: actions/cache@v2
38-
env:
39-
cache-name: cache-node-modules
40-
with:
41-
path: ~/.npm
42-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
43-
restore-keys: |
44-
${{ runner.os }}-build-${{ env.cache-name }}-
45-
${{ runner.os }}-build-
46-
${{ runner.os }}-
47-
- uses: actions/setup-node@v1.4.4
48-
with:
49-
node-version: "12"
50-
- uses: ./.github/actions/unit-tests
31+
name: Unit Tests
32+
runs-on: ubuntu-18.04
33+
needs: [lint]
34+
steps:
35+
- uses: actions/checkout@v2
36+
- name: Cache node modules
37+
uses: actions/cache@v2
38+
env:
39+
cache-name: cache-node-modules
40+
with:
41+
path: ~/.npm
42+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
43+
restore-keys: |
44+
${{ runner.os }}-build-${{ env.cache-name }}-
45+
${{ runner.os }}-build-
46+
${{ runner.os }}-
47+
- uses: actions/setup-node@v1.4.4
48+
with:
49+
node-version: "12"
50+
- uses: ./.github/actions/unit-tests
5151

5252
functional-tests:
53-
name: Functional Tests
54-
runs-on: ubuntu-18.04
55-
needs: [unit-tests]
56-
steps:
57-
- uses: actions/checkout@v2
58-
with:
59-
submodules: 'recursive'
60-
- name: Cache node modules
61-
uses: actions/cache@v2
62-
env:
63-
cache-name: cache-node-modules
64-
with:
65-
path: ~/.npm
66-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
67-
restore-keys: |
68-
${{ runner.os }}-build-${{ env.cache-name }}-
69-
${{ runner.os }}-build-
70-
${{ runner.os }}-
71-
- uses: actions/setup-node@v1.4.4
72-
with:
73-
node-version: "12"
74-
- uses: ./.github/actions/functional-tests
75-
with:
53+
name: Functional Tests
54+
runs-on: ubuntu-18.04
55+
needs: [unit-tests]
56+
steps:
57+
- uses: actions/checkout@v2
58+
with:
59+
submodules: "recursive"
60+
- name: Cache node modules
61+
uses: actions/cache@v2
62+
env:
63+
cache-name: cache-node-modules
64+
with:
65+
path: ~/.npm
66+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
67+
restore-keys: |
68+
${{ runner.os }}-build-${{ env.cache-name }}-
69+
${{ runner.os }}-build-
70+
${{ runner.os }}-
71+
- uses: actions/setup-node@v1.4.4
72+
with:
73+
node-version: "12"
74+
- uses: ./.github/actions/functional-tests
75+
with:
7676
CYPRESS_RECORD_KEY_DOC: ${{ secrets.CYPRESS_RECORD_KEY_DOC }}
7777

7878
admin-console-tests:
@@ -99,33 +99,33 @@ jobs:
9999
with:
100100
sdk-version: 7
101101
cypress-key: ${{ secrets.CYPRESS_RECORD_KEY }}
102-
102+
103103
documentation-snippet-tests:
104-
name: Documentation Snippet Tests
105-
needs: [unit-tests]
106-
runs-on: ubuntu-18.04
107-
steps:
108-
- uses: actions/checkout@v2
109-
- name: Cache node modules
110-
uses: actions/cache@v2
111-
env:
112-
cache-name: cache-node-modules
113-
with:
114-
path: ~/.npm
115-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
116-
restore-keys: |
117-
${{ runner.os }}-build-${{ env.cache-name }}-
118-
${{ runner.os }}-build-
119-
${{ runner.os }}-
120-
- uses: actions/setup-node@v1.4.4
121-
with:
122-
node-version: "12"
123-
- uses: ./.github/actions/snippet-tests
124-
with:
104+
name: Documentation Snippet Tests
105+
needs: [unit-tests]
106+
runs-on: ubuntu-18.04
107+
steps:
108+
- uses: actions/checkout@v2
109+
- name: Cache node modules
110+
uses: actions/cache@v2
111+
env:
112+
cache-name: cache-node-modules
113+
with:
114+
path: ~/.npm
115+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
116+
restore-keys: |
117+
${{ runner.os }}-build-${{ env.cache-name }}-
118+
${{ runner.os }}-build-
119+
${{ runner.os }}-
120+
- uses: actions/setup-node@v1.4.4
121+
with:
122+
node-version: "12"
123+
- uses: ./.github/actions/snippet-tests
124+
with:
125125
CYPRESS_RECORD_KEY_DOC: ${{ secrets.CYPRESS_RECORD_KEY_DOC }}
126126

127127
documentation-staging:
128-
name: Deployment Documentation to staging
128+
name: Deploy Docu to NEXT
129129
runs-on: ubuntu-18.04
130130
needs: [functional-tests, admin-console-tests, documentation-snippet-tests]
131131
steps:
@@ -138,11 +138,12 @@ jobs:
138138
run: |
139139
echo "::set-output name=version::$(git describe --abbrev=0 --tags | cut -d. -f 1)"
140140
echo "::set-output name=repo::$(echo $GITHUB_REPOSITORY | cut -d/ -f 2)"
141+
echo "::set-output name=branch::$(echo $GITHUB_REF | cut -d/ -f 3)"
141142
- uses: convictional/trigger-workflow-and-wait@v1.3.0
142143
with:
143144
owner: kuzzleio
144145
repo: documentation
145146
github_token: ${{ secrets.ACCESS_TOKEN_CI }}
146147
workflow_file_name: child_repo.workflow.yml
147148
ref: develop
148-
inputs: '{"repo_name": "${{ steps.extract-refs.outputs.repo }}", "branch": "${{ github.head_ref }}", "version": "${{ steps.extract-refs.outputs.version }}"}'
149+
inputs: '{"repo_name": "${{ steps.extract-refs.outputs.repo }}", "branch": "${{ steps.extract-refs.outputs.branch }}", "version": "${{ steps.extract-refs.outputs.version }}"}'

‎.github/workflows/push_master.workflow.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Deployment Doc Prod
1+
name: Push to main branch
22

33
on:
44
push:
@@ -125,7 +125,7 @@ jobs:
125125
CYPRESS_RECORD_KEY_DOC: ${{ secrets.CYPRESS_RECORD_KEY_DOC }}
126126

127127
documentation-production:
128-
name: Deployment Doc Prod
128+
name: Deploy Doc to PROD
129129
runs-on: ubuntu-18.04
130130
needs: [functional-tests, documentation-snippet-tests]
131131
steps:
@@ -138,15 +138,16 @@ jobs:
138138
run: |
139139
echo "::set-output name=version::$(git describe --abbrev=0 --tags | cut -d. -f 1)"
140140
echo "::set-output name=repo::$(echo $GITHUB_REPOSITORY | cut -d/ -f 2)"
141+
echo "::set-output name=branch::$(echo $GITHUB_REF | cut -d/ -f 3)"
141142
- uses: convictional/trigger-workflow-and-wait@v1.3.0
142143
with:
143144
owner: kuzzleio
144145
repo: documentation
145146
github_token: ${{ secrets.ACCESS_TOKEN_CI }}
146147
workflow_file_name: child_repo.workflow.yml
147148
ref: master
148-
inputs: '{"repo_name": "${{ steps.extract-refs.outputs.repo }}", "branch": "${{ github.head_ref }}", "version": "${{ steps.extract-refs.outputs.version }}"}'
149-
149+
inputs: '{"repo_name": "${{ steps.extract-refs.outputs.repo }}", "branch": "${{ steps.extract-refs.outputs.branch }}", "version": "${{ steps.extract-refs.outputs.version }}"}'
150+
150151
npm-deploy:
151152
name: Publish Package to NPM.js
152153
runs-on: ubuntu-18.04

0 commit comments

Comments
 (0)