Skip to content

Commit b332caa

Browse files
github-actions[bot]github-actions[bot]
committed
Merge commit '36b5148f57a02f909aa6e7420ac66ebc6b71b0e4' into release
2 parents b451c91 + 36b5148 commit b332caa

Some content is hidden

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

43 files changed

+871
-521
lines changed

‎.editorconfig

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
indent_style = space
9+
indent_size = 2
10+
end_of_line = lf
11+
charset = utf-8
12+
trim_trailing_whitespace = true
13+
insert_final_newline = true
14+

‎.github/dependabot.yml

-8
This file was deleted.

‎.github/workflows/CI.yml

+187
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- v[0-9]+.[0-9x]+.x
8+
pull_request:
9+
10+
env:
11+
NEXT_TELEMETRY_DISABLED: 1
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
container: registry.gitlab.com/dealmore/dealmore-build-images/lambda:nodejs14.x
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
21+
- name: Cache
22+
uses: actions/cache@v2
23+
with:
24+
path: |
25+
.yarn
26+
**/node_modules
27+
key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
28+
29+
- name: Install dependencies
30+
run: yarn --frozen-lockfile --cache-folder .yarn
31+
32+
- name: Build runtime
33+
run: yarn workspace @millihq/tf-next-runtime build
34+
35+
- name: Build tf-next
36+
run: yarn workspace tf-next build
37+
38+
- name: Build proxy
39+
run: yarn workspace @millihq/terraform-next-proxy build
40+
41+
- name: Build deploy-trigger
42+
run: yarn workspace @millihq/terraform-next-deploy-trigger build
43+
44+
- name: Upload build artifacts
45+
uses: actions/upload-artifact@v2
46+
with:
47+
name: dist
48+
path: |
49+
packages/runtime/dist/
50+
packages/tf-next/dist/
51+
packages/proxy/dist.zip
52+
packages/deploy-trigger/dist.zip
53+
if-no-files-found: error
54+
55+
test-integration:
56+
needs: build
57+
runs-on: ubuntu-latest
58+
container: registry.gitlab.com/dealmore/dealmore-build-images/lambda:nodejs14.x
59+
services:
60+
s3:
61+
image: registry.gitlab.com/dealmore/dealmore-build-images:s3-emulator
62+
env:
63+
MINIO_ACCESS_KEY: test
64+
MINIO_SECRET_KEY: testtest
65+
66+
env:
67+
MINIO_ACCESS_KEY: test
68+
MINIO_SECRET_KEY: testtest
69+
S3_ENDPOINT: s3:9000
70+
71+
steps:
72+
- uses: actions/checkout@v2
73+
74+
- name: Cache
75+
uses: actions/cache@v2
76+
with:
77+
path: |
78+
.yarn
79+
**/node_modules
80+
key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
81+
82+
- name: Yarn install
83+
run: yarn --frozen-lockfile --cache-folder .yarn
84+
85+
- name: Download build artifacts
86+
uses: actions/download-artifact@v2
87+
with:
88+
name: dist
89+
path: packages
90+
91+
- name: Jest
92+
run: yarn test
93+
94+
test-e2e-prepare:
95+
needs: build
96+
runs-on: ubuntu-latest
97+
container: registry.gitlab.com/dealmore/dealmore-build-images/lambda:nodejs14.x
98+
steps:
99+
- uses: actions/checkout@v2
100+
101+
- name: Cache
102+
uses: actions/cache@v2
103+
with:
104+
path: |
105+
.yarn
106+
**/node_modules
107+
key: ${{ runner.os }}-${{ hashFiles('yarn.lock') }}
108+
109+
- name: Yarn install
110+
run: yarn --frozen-lockfile --cache-folder .yarn
111+
112+
- name: Download build artifacts
113+
uses: actions/download-artifact@v2
114+
with:
115+
name: dist
116+
path: packages
117+
118+
- name: Build e2e fixtures
119+
run: yarn test:e2e:prepare
120+
121+
- name: Upload e2e fixtures
122+
uses: actions/upload-artifact@v2
123+
with:
124+
name: e2e-fixtures
125+
path: test/fixtures/**/.next-tf/**/*
126+
if-no-files-found: error
127+
128+
test-e2e:
129+
needs: [build, test-e2e-prepare]
130+
runs-on: ubuntu-latest
131+
services:
132+
s3:
133+
image: registry.gitlab.com/dealmore/dealmore-build-images:s3-emulator
134+
env:
135+
MINIO_ACCESS_KEY: test
136+
MINIO_SECRET_KEY: testtest
137+
ports:
138+
- 9000:9000
139+
env:
140+
SAM_CLI_TELEMETRY: 0
141+
# Don't worry these are fake AWS credentials for AWS SAM
142+
AWS_ACCESS_KEY_ID: ABIAZLJNBT8I3KFOU4NO
143+
AWS_SECRET_ACCESS_KEY: 4Xt3Rbx4DO21MhK1IHXZXRvVRDuqaQ0Wo5lILA/h
144+
MINIO_ACCESS_KEY: test
145+
MINIO_SECRET_KEY: testtest
146+
147+
steps:
148+
- name: Setup AWS SAM
149+
run: |
150+
brew tap aws/tap
151+
brew install aws-sam-cli
152+
sam --version
153+
154+
- uses: actions/checkout@v2
155+
156+
- name: Cache
157+
uses: actions/cache@v2
158+
with:
159+
path: |
160+
.yarn
161+
**/node_modules
162+
key: ${{ runner.os }}-e2e-${{ hashFiles('yarn.lock') }}
163+
164+
- name: Download build artifacts
165+
uses: actions/download-artifact@v2
166+
with:
167+
name: dist
168+
path: packages
169+
170+
- name: Download prebuilt e2e fixtures
171+
uses: actions/download-artifact@v2
172+
with:
173+
name: e2e-fixtures
174+
path: test/fixtures
175+
176+
- name: Install dependencies
177+
run: yarn --frozen-lockfile --cache-folder .yarn
178+
179+
- name: Run e2e-test
180+
run: yarn test:e2e --runInBand
181+
182+
- name: Output SAM logs
183+
run: |
184+
printf "\n\nOutput of sam-local.log:\n"
185+
cat sam-local.log
186+
printf "\n\nOutput of sam-api.log:\n"
187+
cat sam-api.log

‎.github/workflows/lint.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- v[0-9]+.[0-9x]+.x
78
pull_request:
89

910
jobs:

‎.github/workflows/release.yml

+15-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
tag:
77
description: 'Tag'
88
required: true
9+
releaseBranch:
10+
description: 'Release branch'
11+
required: true
12+
default: 'release'
913

1014
jobs:
1115
release:
@@ -16,9 +20,16 @@ jobs:
1620
with:
1721
fetch-depth: 0
1822

19-
- uses: dealmore/gh-action-release-branch@v1.1.0
23+
- uses: milliHQ/gh-action-release-branch@v2.0.0
2024
with:
21-
upstream-branch: main
22-
release-branch: release
25+
release-branch: ${{ github.event.inputs.releaseBranch }}
2326
release-tag: ${{ github.event.inputs.tag }}
24-
exclude: '["packages/**/*", "test/**/*", "package.json", "yarn.lock"]'
27+
exclude: |
28+
.vscode/**/*
29+
packages/**/*
30+
test/**/*
31+
docker-compose.yml
32+
jest.config.js
33+
package.json
34+
tsconfig.json
35+
yarn.lock

‎.github/workflows/test.yml

-104
This file was deleted.

‎.github/workflows/tf-docs.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ on:
77
push:
88
branches:
99
- main
10+
- v[0-9]+.[0-9x]+.x
1011

1112
jobs:
1213
update-docs:
1314
runs-on: ubuntu-latest
1415
steps:
1516
- uses: actions/checkout@v2
1617
- name: Update Terraform docs in README
17-
uses: Dirrk/terraform-docs@v1.0.8
18+
uses: terraform-docs/[email protected]
1819
with:
19-
tf_docs_output_file: README.md
20-
tf_docs_git_push: 'true'
21-
tf_docs_git_commit_message: 'terraform-docs: Update'
20+
config-file: '.terraform-docs.yml'
21+
output-file: README.md
22+
git-push: 'true'
23+
git-commit-message: 'docs: Update Terraform docs'

‎.gitignore

+8
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,11 @@ node_modules
1212

1313
# Temp files
1414
*.swp*
15+
16+
# Log files
17+
*.log
18+
19+
# direnv
20+
.direnv
21+
.envrc
22+

0 commit comments

Comments
 (0)