Skip to content

Commit

Permalink
Merge pull request #2779 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu authored Jun 12, 2024
2 parents 2ed0887 + 530acf8 commit fb57ec4
Show file tree
Hide file tree
Showing 19 changed files with 2,091 additions and 1,736 deletions.
3 changes: 2 additions & 1 deletion .c8rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"lib/*",
"test/hot.js",
"src/plugin/tasks/**",
"test/projects/**"
"test/projects/**",
"eslint.config.js"
],
"temp-directory": "./coverage/.c8_output",
"reports-dir": "./coverage",
Expand Down
27 changes: 13 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
workflows:
version: 2
node-multi-build:
jobs:
- gally-create-pr
- test-node-v18:
requires:
- gally-create-pr
- test-node-v16:
- test-node-v21:
requires:
- gally-create-pr
- test-node-v20:
Expand All @@ -16,7 +15,7 @@ workflows:
requires:
- gally-create-pr
- test-node-v18
- test-node-v16
- test-node-v21
- test-node-v20
filters:
branches:
Expand All @@ -25,23 +24,23 @@ workflows:
requires:
- gally-create-pr
- test-node-v18
- test-node-v16
- test-node-v21
- test-node-v20
filters:
branches:
only: master
version: 2
version: 2.1
jobs:
gally-create-pr:
docker:
- image: cimg/node:16.20
- image: cimg/node:20.11
steps:
- checkout
- run: sudo yarn global add gally
- run: ga promote $CIRCLE_BRANCH
release:
docker:
- image: cimg/node:16.20
- image: cimg/node:20.11
steps:
- checkout
- run:
Expand Down Expand Up @@ -71,7 +70,7 @@ jobs:
- run: yarn run semantic-release
gally-auto-approve:
docker:
- image: cimg/node:16.20
- image: cimg/node:20.11
steps:
- run:
name: Set PR number
Expand All @@ -88,9 +87,9 @@ jobs:
- run: >-
ga approve $CIRCLE_PR_NUMBER --condition
"base.ref=dev&state=open&user.login=dependabot-preview[bot]"
test-node-v16:
test-node-v18:
docker:
- image: cimg/node:16.20
- image: cimg/node:18.19
steps:
- checkout
- run:
Expand Down Expand Up @@ -120,9 +119,9 @@ jobs:
- run: >-
(git add . && git diff-index --quiet HEAD --) || (git status && exit
1);
test-node-v18:
test-node-v20:
docker:
- image: cimg/node:18.16
- image: cimg/node:20.11
steps:
- checkout
- run:
Expand Down Expand Up @@ -152,9 +151,9 @@ jobs:
- run: >-
(git add . && git diff-index --quiet HEAD --) || (git status && exit
1);
test-node-v20:
test-node-v21:
docker:
- image: cimg/node:20.4
- image: cimg/node:21.6
steps:
- checkout
- run:
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"extends": [
"airbnb-base",
"plugin:mocha/recommended",
"plugin:markdown/recommended"
"plugin:markdown/recommended-legacy"
],
"rules": {
"@blackflux/rules/c8-prevent-ignore": 1,
Expand Down
2 changes: 1 addition & 1 deletion .gally.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"contexts": [
"ci/circleci: gally-create-pr",
"ci/circleci: test-node-v18",
"ci/circleci: test-node-v16",
"ci/circleci: test-node-v21",
"ci/circleci: test-node-v20"
]
},
Expand Down
2 changes: 1 addition & 1 deletion .roboconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"packageName": "lambda-monitor",
"projectName": "lambda-monitor",
"owner": "simlu",
"nodeVersion": "16",
"nodeVersion": "18",
"ownerName": "Lukas Siemon",
"mergeBot": "MrsFlux",
"nccEnabled": false
Expand Down
4 changes: 3 additions & 1 deletion .roboconfig.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
"LICENSE",
"README.md",
"docker/Dockerfile",
"eslint.config.js",
"gardener.js",
"manage.sh",
"package.json",
"src/index.js",
"test/hot.js",
"test/index.spec.js"
"test/index.spec.js",
"test/reg.js"
]
}
90 changes: 85 additions & 5 deletions CONFDOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ Documents configuration tasks managed by [robo-config](https://github.com/blackf
- <a name="blackfluxrobo-config-plugin-task-idx-ref-structnpm-default">:open_file_folder:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structnpm-default">`struct/#npm-default`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-structforce-gardener">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structforce-gardener">`struct/force-gardener`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-structnpm-base">:open_file_folder:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structnpm-base">`struct/#npm-base`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-structtest-reg">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtest-reg">`struct/test-reg`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-structtest-hot">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtest-hot">`struct/test-hot`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-structtemplate-readme">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtemplate-readme">`struct/template-readme`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-structtemplate-mocharc">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtemplate-mocharc">`struct/template-mocharc`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-structtemplate-index-test">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtemplate-index-test">`struct/template-index-test`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-structtemplate-index">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtemplate-index">`struct/template-index`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-structtemplate-eslintrc">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtemplate-eslintrc">`struct/template-eslintrc`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-structtemplate-eslint-config">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-structtemplate-eslint-config">`struct/template-eslint-config`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-semantic-releasenpm-default">:open_file_folder:</a> <a href="#blackfluxrobo-config-plugin-task-ref-semantic-releasenpm-default">`semantic-release/#npm-default`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-semantic-releasecommit-conventions">:clipboard:</a> <a href="#blackfluxrobo-config-plugin-task-ref-semantic-releasecommit-conventions">`semantic-release/commit-conventions`</a>
- <a name="blackfluxrobo-config-plugin-task-idx-ref-packagenpm-default">:open_file_folder:</a> <a href="#blackfluxrobo-config-plugin-task-ref-packagenpm-default">`package/#npm-default`</a>
Expand Down Expand Up @@ -192,6 +194,7 @@ Manage various configuration files for an open source npm package on github.
<code>│&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-ideaprojectnameiml">${projectName}.iml</a></code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-c8rcjson">.c8rc.json</a></code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-editorconfig">.editorconfig</a></code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-eslintconfigjs">eslint.config.js</a></code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-eslintrcjson">.eslintrc.json</a></code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-gallyjson">.gally.json</a></code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-gardenerjs">gardener.js</a></code><br/>
Expand All @@ -206,7 +209,8 @@ Manage various configuration files for an open source npm package on github.
<code>│&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-srcindexjs">index.js</a></code><br/>
<code>└─&nbsp;test</code><br/>
<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">hot.js</a></code><br/>
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testregjs">reg.js</a></code><br/>
</ul>
</td>
<td align="left" valign="top">
Expand Down Expand Up @@ -261,6 +265,7 @@ Manage basic project structure for npm package on github.
<td align="left" valign="top">
<ul>
<code>project</code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-eslintconfigjs">eslint.config.js</a></code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-eslintrcjson">.eslintrc.json</a></code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-gardenerjs">gardener.js</a></code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-mocharcyml">.mocharc.yml</a></code><br/>
Expand All @@ -269,7 +274,8 @@ Manage basic project structure for npm package on github.
<code>│&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-srcindexjs">index.js</a></code><br/>
<code>└─&nbsp;test</code><br/>
<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">hot.js</a></code><br/>
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testregjs">reg.js</a></code><br/>
</ul>
</td>
<td align="left" valign="top">
Expand Down Expand Up @@ -334,14 +340,16 @@ Manage basic project structure for npm package on github.
<td align="left" valign="top">
<ul>
<code>project</code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-eslintconfigjs">eslint.config.js</a></code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-eslintrcjson">.eslintrc.json</a></code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-mocharcyml">.mocharc.yml</a></code><br/>
<code>├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-readmemd">README.md</a></code><br/>
<code>├─&nbsp;src</code><br/>
<code>│&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-srcindexjs">index.js</a></code><br/>
<code>└─&nbsp;test</code><br/>
<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">hot.js</a></code><br/>
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
<code>&nbsp;&nbsp;&nbsp;├─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testindexspecjs">index.spec.js</a></code><br/>
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testregjs">reg.js</a></code><br/>
</ul>
</td>
<td align="left" valign="top">
Expand All @@ -361,11 +369,40 @@ Manage basic project structure for npm package on github.
</tbody>
</table>

###### :clipboard: <a name="blackfluxrobo-config-plugin-task-ref-structtest-reg">struct/test-reg</a> (<a href="#blackfluxrobo-config-plugin-task-idx-ref-structtest-reg">`index`</a>)

_Updating <a href="#blackfluxrobo-config-plugin-target-ref-testregjs">test/reg.js</a> using <a href="#blackfluxrobo-config-plugin-strat-ref-overwrite">overwrite</a>._

- Create register file.

<table>
<tbody>
<tr>
<th>Targets</th>
<th>Requires</th>
</tr>
<tr>
<td align="left" valign="top">
<ul>
<code>project</code><br/>
<code>└─&nbsp;test</code><br/>
<code>&nbsp;&nbsp;&nbsp;└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-testregjs">reg.js</a></code><br/>
</ul>
</td>
<td align="left" valign="top">
<ul>
<li><a href="#blackfluxrobo-config-plugin-req-ref-javascript">javascript</a></li>
</ul>
</td>
</tr>
</tbody>
</table>

###### :clipboard: <a name="blackfluxrobo-config-plugin-task-ref-structtest-hot">struct/test-hot</a> (<a href="#blackfluxrobo-config-plugin-task-idx-ref-structtest-hot">`index`</a>)

_Updating <a href="#blackfluxrobo-config-plugin-target-ref-testhotjs">test/hot.js</a> using <a href="#blackfluxrobo-config-plugin-strat-ref-overwrite">overwrite</a>._

- Create custom loader file.
- Create loader file.

<table>
<tbody>
Expand Down Expand Up @@ -535,6 +572,35 @@ _Updating <a href="#blackfluxrobo-config-plugin-target-ref-eslintrcjson">.eslint
</tbody>
</table>

###### :clipboard: <a name="blackfluxrobo-config-plugin-task-ref-structtemplate-eslint-config">struct/template-eslint-config</a> (<a href="#blackfluxrobo-config-plugin-task-idx-ref-structtemplate-eslint-config">`index`</a>)

_Updating <a href="#blackfluxrobo-config-plugin-target-ref-eslintconfigjs">eslint.config.js</a> using <a href="#blackfluxrobo-config-plugin-strat-ref-overwrite">overwrite</a>._

- Create configuration file for eslint enforcing opinionated, best practices.

<table>
<tbody>
<tr>
<th>Targets</th>
<th>Requires</th>
</tr>
<tr>
<td align="left" valign="top">
<ul>
<code>project</code><br/>
<code>└─&nbsp;<a href="#blackfluxrobo-config-plugin-target-ref-eslintconfigjs">eslint.config.js</a></code><br/>
</ul>
</td>
<td align="left" valign="top">
<ul>
<li><a href="#blackfluxrobo-config-plugin-req-ref-javascript">javascript</a></li>
<li><a href="#blackfluxrobo-config-plugin-req-ref-eslint">eslint</a></li>
</ul>
</td>
</tr>
</tbody>
</table>

#### :open_file_folder: <a name="blackfluxrobo-config-plugin-task-ref-semantic-releasenpm-default">semantic-release/#npm-default</a> (<a href="#blackfluxrobo-config-plugin-task-idx-ref-semantic-releasenpm-default">`index`</a>)

Manage semantic-release configuration for npm package on github.
Expand Down Expand Up @@ -1773,11 +1839,17 @@ Contains instructions for the main docker container this repository uses for tes

Execute all configured js-gardener tasks.

### <a name="blackfluxrobo-config-plugin-target-ref-testregjs">test/reg.js</a>

:small_blue_diamond: `other`

*Registration hook to load custom loader.*

### <a name="blackfluxrobo-config-plugin-target-ref-testhotjs">test/hot.js</a>

:small_blue_diamond: `other`

*Custom loader to allow hot reloading of files for testing.*
*Loader to allow hot reloading of files for testing.*

### <a name="blackfluxrobo-config-plugin-target-ref-readmemd">README.md</a> ([`link`](https://help.github.com/en/articles/about-readmes))

Expand Down Expand Up @@ -1823,6 +1895,14 @@ Main file for the project. Exposes functionality for libraries.

*Configuration file for eslint.*

### <a name="blackfluxrobo-config-plugin-target-ref-eslintconfigjs">eslint.config.js</a> ([`link`](https://eslint.org/docs/latest/use/configure/configuration-files-new))

:small_red_triangle: <a href="#blackfluxrobo-config-plugin-req-ref-eslint">eslint</a>

:small_blue_diamond: `nostruct`

*Configuration file for eslint.*

### <a name="blackfluxrobo-config-plugin-target-ref-releasercjson">.releaserc.json</a> ([`link`](https://semantic-release.gitbook.io/semantic-release/usage/configuration#configuration-file))

:small_red_triangle: <a href="#blackfluxrobo-config-plugin-req-ref-semantic-release">semantic-release</a>
Expand Down
5 changes: 4 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,7 @@ RUN chmod -R 757 /user
# set correct execution env
ENV LAMBDA_TASK_ROOT /user/project

ENTRYPOINT (cd project && bash)
ARG COMMAND=bash
ENV COMMAND=${COMMAND}

ENTRYPOINT (cd project && $COMMAND)
Loading

0 comments on commit fb57ec4

Please sign in to comment.