Skip to content

Commit 602fcf9

Browse files
mlodicmlodic
authored
Merge pull request #348 from intelowlproject/develop
1.3.4
2 parents cbe58f3 + be91b7b commit 602fcf9

28 files changed

+1478
-1433
lines changed

‎.github/.pre-commit-config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
repos:
22
- repo: https://github.com/pycqa/flake8
3-
rev: 5.0.4
3+
rev: 7.1.1
44
hooks:
55
- id: flake8
66
args: ["--config", ".github/configurations/python_linters/.flake8"]
77

88
- repo: https://github.com/pycqa/isort
9-
rev: 5.12.0
9+
rev: 5.13.2
1010
hooks:
1111
- id: isort
1212
args: ["--settings-path", ".github/configurations/python_linters/.isort.cfg", "--filter-files", "--skip", "venv"]
1313

1414
- repo: https://github.com/psf/black
15-
rev: 22.3.0
15+
rev: 24.8.0
1616
hooks:
1717
- id: black
1818
args: ["--config", ".github/configurations/python_linters/.black"]

‎.github/actions/apt_requirements/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ runs:
2020

2121
- name: Cache apt packages
2222
id: cache-apt-packages
23-
uses: awalsh128/cache-apt-pkgs-action@v1
23+
uses: awalsh128/cache-apt-pkgs-action@latest
2424
with:
2525
packages: ${{ steps.export-apt-requirements.outputs.apt_packages }}

‎.github/actions/python_linter/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ runs:
3030
- name: Pylint formatter
3131
run: |
3232
if [[ ${{ inputs.use_pylint }} != 'false' ]]; then
33-
pylint . --rcfile ${GITHUB_WORKSPACE}/.github/configurations/python_linters/.pylintrc
33+
pylint * --rcfile ${GITHUB_WORKSPACE}/.github/configurations/python_linters/.pylintrc --ignore-patterns ".*(?<!py)$"
3434
else
3535
echo "Skipping pylint formatter"
3636
fi

‎.github/actions/services/action.yml

+40-27
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ inputs:
2020
description: Use mongo service
2121
required: true
2222

23-
2423
postgres_db:
2524
description: Postgres service db. Requires use_postgres to be true
2625
required: true
@@ -34,17 +33,36 @@ inputs:
3433
description: Postgres alpine version
3534
required: true
3635

36+
mongo_version:
37+
description: Mongo container version
38+
required: true
39+
elasticsearch_version:
40+
description: Elasticsearch container version
41+
required: true
42+
elasticsearch_port:
43+
description: Elasticsearch container exposed port
44+
required: true
45+
memcached_version:
46+
description: Memcached alpine container version
47+
required: true
48+
redis_version:
49+
description: Redis alpine container version
50+
required: true
51+
rabbitmq_version:
52+
description: RabbitMQ management-alpine container version
53+
required: true
54+
55+
3756
runs:
3857
using: "composite"
3958
steps:
4059

41-
- name: Create mongo docker-compose file
60+
- name: Create mongo docker compose file
4261
if: inputs.use_mongo
4362
run: |
44-
echo "version: '3.7'" > mongo.yml
45-
echo "services:" >> mongo.yml
63+
echo "services:" > mongo.yml
4664
echo " mongo:" >> mongo.yml
47-
echo " image: library/mongo:4.4" >> mongo.yml
65+
echo " image: library/mongo:${{ inputs.mongo_version }}" >> mongo.yml
4866
echo " container_name: mongo" >> mongo.yml
4967
echo " ports:" >> mongo.yml
5068
echo " - 27017:27017" >> mongo.yml
@@ -55,11 +73,10 @@ runs:
5573
shell:
5674
bash
5775

58-
- name: Create postgres docker-compose file
76+
- name: Create postgres docker compose file
5977
if: inputs.use_postgres
6078
run: |
61-
echo "version: '3.7'" > postgres.yml
62-
echo "services:" >> postgres.yml
79+
echo "services:" > postgres.yml
6380
echo " postgres:" >> postgres.yml
6481
echo " image: library/postgres:${{ inputs.postgres_version }}-alpine" >> postgres.yml
6582
echo " container_name: postgres" >> postgres.yml
@@ -77,19 +94,18 @@ runs:
7794
shell:
7895
bash
7996

80-
- name: Create elasticsearch docker-compose file
97+
- name: Create elasticsearch docker compose file
8198
if: inputs.use_elastic_search
8299
run: |
83-
echo "version: '3.7'" > elastic_search.yml
84-
echo "services:" >> elastic_search.yml
100+
echo "services:" > elastic_search.yml
85101
echo " elastic_search:" >> elastic_search.yml
86-
echo " image: elasticsearch:7.10.1" >> elastic_search.yml
102+
echo " image: elasticsearch:${{ inputs.elasticsearch_version }}" >> elastic_search.yml
87103
echo " container_name: elastic_search" >> elastic_search.yml
88104
echo " environment:" >> elastic_search.yml
89105
echo " ES_JAVA_OPTS: -Xms1g -Xmx1g" >> elastic_search.yml
90106
echo " discovery.type: single-node" >> elastic_search.yml
91107
echo " ports:" >> elastic_search.yml
92-
echo " - 59200:9200" >> elastic_search.yml
108+
echo " - ${{ inputs.elasticsearch_port }}:9200" >> elastic_search.yml
93109
echo " healthcheck:" >> elastic_search.yml
94110
echo " test: curl -X GET 'localhost:9200/_cluster/health?wait_for_status=yellow&timeout=180s&pretty'" >> elastic_search.yml
95111
echo " interval: 10s" >> elastic_search.yml
@@ -98,49 +114,46 @@ runs:
98114
shell:
99115
bash
100116

101-
- name: Create memcached docker-compose file
117+
- name: Create memcached docker compose file
102118
if: inputs.use_memcached
103119
run: |
104-
echo "version: '3.7'" > memcached.yml
105-
echo "services:" >> memcached.yml
120+
echo "services:" > memcached.yml
106121
echo " memcached:" >> memcached.yml
107122
echo " container_name: memcached" >> memcached.yml
108-
echo " image: memcached:1.6.9-alpine" >> memcached.yml
123+
echo " image: memcached:${{ inputs.memcached_version }}-alpine" >> memcached.yml
109124
echo " ports:" >> memcached.yml
110125
echo " - 11211:11211" >> memcached.yml
111126
shell:
112127
bash
113128

114-
- name: Create redis docker-compose file
129+
- name: Create redis docker compose file
115130
if: inputs.use_redis
116131
run: |
117-
echo "version: '3.7'" > redis.yml
118-
echo "services:" >> redis.yml
132+
echo "services:" > redis.yml
119133
echo " redis:" >> redis.yml
120134
echo " container_name: redis" >> redis.yml
121-
echo " image: library/redis:5.0.9-alpine" >> redis.yml
135+
echo " image: library/redis:${{ inputs.redis_version }}-alpine" >> redis.yml
122136
echo " ports:" >> redis.yml
123137
echo " - 6379:6379" >> redis.yml
124138
shell:
125139
bash
126140

127-
- name: Create rabbitmq docker-compose file
141+
- name: Create rabbitmq docker compose file
128142
if: inputs.use_rabbitmq
129143
run: |
130-
echo "version: '3.7'" > rabbitmq.yml
131-
echo "services:" >> rabbitmq.yml
144+
echo "services:" > rabbitmq.yml
132145
echo " rabbitmq:" >> rabbitmq.yml
133146
echo " container_name: rabbitmq" >> rabbitmq.yml
134-
echo " image: library/rabbitmq:3.9-management-alpine" >> rabbitmq.yml
147+
echo " image: library/rabbitmq:${{ inputs.rabbitmq_version }}-management-alpine" >> rabbitmq.yml
135148
echo " ports:" >> rabbitmq.yml
136149
echo " - 15672:15672" >> rabbitmq.yml
137150
echo " - 5672:5672" >> rabbitmq.yml
138151
shell:
139152
bash
140153

141-
- name: Execute docker-compose up
154+
- name: Execute docker compose up
142155
run: |
143-
CLI=docker-compose
156+
CLI="docker compose"
144157
if [[ ${{ inputs.use_postgres }} != 'false' ]]; then
145158
CLI="${CLI} -f postgres.yml"
146159
fi

‎.github/configurations/node_linters/README.md

+12
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,22 @@ Here are some examples:
4949
In `.vscode/settings.json`
5050
```json
5151
{
52+
"editor.formatOnSave": true,
5253
"eslint.options": {
5354
"overrideConfigFile": ".github/configurations/node_linters/eslint/.eslintrc.json"
5455
},
56+
"eslint.format.enable": true,
5557
"stylelint.configFile": ".github/configurations/node_linters/stylelint/.stylelintrc.json",
58+
"stylelint.validate": ["css", "less", "postcss", "scss"],
59+
"stylelint.snippet": ["css", "less", "postcss", "scss"],
5660
"prettier.configPath": ".github/configurations/node_linters/prettier/.prettierrc.js",
61+
"editor.semanticHighlighting.enabled": true,
62+
"editor.defaultFormatter": "esbenp.prettier-vscode",
63+
"[javascriptreact]": {
64+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
65+
},
66+
"[javascript]": {
67+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
68+
}
5769
}
5870
```

0 commit comments

Comments
 (0)