Skip to content

Commit

Permalink
Merge pull request #2018 from loopmediagroup/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Mar 20, 2023
2 parents 93cbb0d + bc232cc commit 1834c00
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Expand Up @@ -67,7 +67,7 @@ jobs:
key: yarn-packages-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- run: yarn global add semantic-release
- run: yarn global add "semantic-release@^19.0.5"
- run: yarn run semantic-release
gally-auto-approve:
docker:
Expand All @@ -93,7 +93,7 @@ jobs:
- image: circleci/node:14
environment:
opensearchEndpoint: localhost:9200
- image: opensearchproject/opensearch:2.3.0
- image: opensearchproject/opensearch:2.5.0
environment:
- discovery.type=single-node
- plugins.security.disabled=true
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
- image: circleci/node:16
environment:
opensearchEndpoint: localhost:9200
- image: opensearchproject/opensearch:2.3.0
- image: opensearchproject/opensearch:2.5.0
environment:
- discovery.type=single-node
- plugins.security.disabled=true
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
- image: cimg/node:18.0
environment:
opensearchEndpoint: localhost:9200
- image: opensearchproject/opensearch:2.3.0
- image: opensearchproject/opensearch:2.5.0
environment:
- discovery.type=single-node
- plugins.security.disabled=true
Expand Down
2 changes: 1 addition & 1 deletion manage.sh
Expand Up @@ -4,7 +4,7 @@ docker run \
--name os1 \
-e "discovery.type=single-node" \
-e "plugins.security.disabled=true" \
-d opensearchproject/opensearch:2.3.0
-d opensearchproject/opensearch:2.5.0

docker build \
-t lambda-environment-node \
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -45,7 +45,7 @@
"@babel/eslint-parser": "7.19.1",
"@babel/register": "7.18.9",
"@blackflux/eslint-plugin-rules": "2.1.0",
"@blackflux/robo-config-plugin": "7.9.14",
"@blackflux/robo-config-plugin": "7.9.20",
"c8": "7.12.0",
"chai": "4.3.7",
"deep-equal-in-any-order": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion test/hot.js
Expand Up @@ -28,7 +28,7 @@ export const resolve = async (specifier, context, defaultResolve) => {
reload: false
};
const content = fs.readFileSync(p, 'utf8');
if (content.includes('/* load-hot */') || content.includes('lru-cache-ext')) {
if (content.includes('/* load-hot */')) {
lookup[p].reload = true;
} else if (content.includes('process.env.')) {
lookup[p].reload = [...content.matchAll(/\bprocess\.env\.([a-zA-Z0-9_]+)\b/g)].map((e) => e[1]);
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -884,10 +884,10 @@
dependencies:
smart-fs "2.0.2"

"@blackflux/robo-config-plugin@7.9.14":
version "7.9.14"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-7.9.14.tgz#ba8cc23a110aa05f4012368117cb725794d94d50"
integrity sha512-bGsyVeGMXZ/+HdJ9kAee32jJQc6A6y8nlmJN9PaXyHxctMUJCc2X2FlBGqI6/vviQBiDNAl/qHZgX9FxlRqv4w==
"@blackflux/robo-config-plugin@7.9.20":
version "7.9.20"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-7.9.20.tgz#11bb533abff7442711d3554440b3aff6a9e34767"
integrity sha512-Z5yky9QdBsclny1nSCtybog5UXNeZUZFGIQ+MSK7g8jAM6ZpBeTWAScQgdiDSz+oZrbq+P/k82P5SyMmkUWXzA==

"@devexpress/error-stack-parser@^2.0.6":
version "2.0.6"
Expand Down

0 comments on commit 1834c00

Please sign in to comment.