Skip to content

Commit

Permalink
Merge pull request #2513 from kuzzleio/2.28.0-proposal
Browse files Browse the repository at this point in the history
Release 2.28.0
  • Loading branch information
rolljee committed Dec 20, 2023
2 parents 4724faa + b604856 commit 4f2b896
Show file tree
Hide file tree
Showing 31 changed files with 578 additions and 3,349 deletions.
5 changes: 0 additions & 5 deletions .ci/scripts/docker-entrypoint.sh

This file was deleted.

12 changes: 0 additions & 12 deletions .ci/scripts/install-aarch64-deps.sh

This file was deleted.

12 changes: 0 additions & 12 deletions .ci/scripts/install-armhf-deps.sh

This file was deleted.

18 changes: 0 additions & 18 deletions .ci/scripts/install-plugins.sh

This file was deleted.

12 changes: 7 additions & 5 deletions .ci/scripts/run-monkey-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,23 @@ set -ex

if [ -z "$NODE_VERSION" ];
then
echo "Missing NODE_VERSION, use default NODE_18_VERSION"
export NODE_VERSION=$NODE_18_VERSION
echo "Missing NODE_VERSION, use default NODE_20_VERSION"
export NODE_VERSION=$NODE_20_VERSION
fi

echo "Testing Kuzzle against node v$NODE_VERSION"

docker compose -f ./.ci/test-cluster.yml down -v

echo "Installing dependencies..."
npm ci --unsafe-perm
docker compose -f ./.ci/test-cluster.yml run --rm kuzzle_node_1 npm ci

if [ "$REBUILD" == "true" ];
then
docker compose -f ./.ci/test-cluster.yml run kuzzle_node_1 npm rebuild
docker compose -f ./.ci/test-cluster.yml run --rm kuzzle_node_1 npm rebuild
fi

npm run build
docker compose -f ./.ci/test-cluster.yml run --rm kuzzle_node_1 npm run build

echo "[$(date)] - Starting Kuzzle Cluster..."

Expand Down
25 changes: 0 additions & 25 deletions .ci/scripts/run-test-arm.sh

This file was deleted.

12 changes: 7 additions & 5 deletions .ci/scripts/run-test-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,23 @@ set -ex

if [ -z "$NODE_VERSION" ];
then
echo "Missing NODE_VERSION, use default NODE_18_VERSION"
export NODE_VERSION=$NODE_18_VERSION
echo "Missing NODE_VERSION, use default NODE_20_VERSION"
export NODE_VERSION=$NODE_20_VERSION
fi

echo "Testing Kuzzle against node v$NODE_VERSION"

docker compose -f ./.ci/test-cluster.yml down -v

echo "Installing dependencies..."
npm ci
docker compose -f ./.ci/test-cluster.yml run --rm kuzzle_node_1 npm ci

if [ "$REBUILD" == "true" ];
then
docker compose -f ./.ci/test-cluster.yml run kuzzle_node_1 npm rebuild
docker compose -f ./.ci/test-cluster.yml run --rm kuzzle_node_1 npm rebuild
fi

npm run build
docker compose -f ./.ci/test-cluster.yml run --rm kuzzle_node_1 npm run build

echo "[$(date)] - Starting Kuzzle Cluster..."

Expand Down
31 changes: 0 additions & 31 deletions .ci/scripts/run-test.sh

This file was deleted.

10 changes: 2 additions & 8 deletions .ci/test-cluster.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.4'

x-kuzzle-config: &kuzzle-config
image: kuzzleio/kuzzle-runner:${NODE_VERSION:-16}
image: kuzzleio/kuzzle-runner:${NODE_VERSION:-20}
command: >
bash -c "
node ./docker/scripts/start-kuzzle-test.js --enable-plugins kuzzle-plugin-cluster,functional-test-plugin
Expand All @@ -28,7 +28,7 @@ x-kuzzle-config: &kuzzle-config
- kuzzle_limits__loginsPerSecond=50
- kuzzle_server__protocols__http__additionalContentTypes=*json:["application/x-yaml"]
- NODE_ENV=development
- NODE_VERSION=${NODE_VERSION:-}
- NODE_VERSION=${NODE_VERSION:-20}
- DEBUG=none
- SECRETS_FILE_PREFIX=/var/app/
# cluster
Expand All @@ -38,7 +38,6 @@ x-kuzzle-config: &kuzzle-config
services:
nginx:
image: nginx:1.19-alpine
container_name: kuzzle_nginx
depends_on:
- kuzzle_node_1
- kuzzle_node_2
Expand All @@ -50,29 +49,24 @@ services:

kuzzle_node_1:
<<: *kuzzle-config
container_name: kuzzle_node_1
ports:
- "17510:7512"
- "1883:1883"

kuzzle_node_2:
<<: *kuzzle-config
container_name: kuzzle_node_2
ports:
- "17511:7512"

kuzzle_node_3:
<<: *kuzzle-config
container_name: kuzzle_node_3
ports:
- "17512:7512"

redis:
image: redis:6
container_name: kuzzle_redis

elasticsearch:
image: kuzzleio/elasticsearch:7
container_name: kuzzle_elasticsearch
ulimits:
nofile: 65536
44 changes: 0 additions & 44 deletions .ci/test.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/build-and-run-kuzzle/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
- run: npm run build
shell: bash

- run: npm prune --production
- run: npm prune --omit=dev
shell: bash

- run: |
Expand Down
11 changes: 0 additions & 11 deletions .github/actions/es-lint/action.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/kuzzle-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

env:
DOCKER_PLATFORMS: "linux/amd64,linux/arm64,linux/arm/v7"
NODE_VERSION: "20"

jobs:
dockerhub-deploy:
Expand Down Expand Up @@ -41,5 +42,6 @@ jobs:
context: .
file: ./docker/images/kuzzle/Dockerfile
push: true
build-args: NODE_VERSION=${{ env.NODE_VERSION }}
platforms: ${{ env.DOCKER_PLATFORMS }}
tags: kuzzleio/kuzzle:${{ steps.get-version.outputs.major-version }},kuzzleio/kuzzle:latest,kuzzleio/kuzzle:${{ steps.get-version.outputs.version }}
2 changes: 1 addition & 1 deletion .github/workflows/kuzzle-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ jobs:
context: ./docker/images/kuzzle-runner
file: ./docker/images/kuzzle-runner/Dockerfile
push: true
build-args: NODE_LTS_VERSION=${{ matrix.node-version }}
build-args: NODE_VERSION=${{ matrix.node-version }}
platforms: ${{ env.DOCKER_PLATFORMS }}
tags: kuzzleio/kuzzle-runner:${{ matrix.node-version }}
8 changes: 5 additions & 3 deletions .github/workflows/workflow-deployments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,18 @@ jobs:
- name: Install additional libraries
uses: ./.github/actions/install-packages

- name: Node version ${{ inputs.node_lts_active_version }}
- name: Node version ${{ inputs.node_lts_current_version }}
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node_lts_active_version }}
node-version: ${{ inputs.node_lts_current_version }}
registry-url: "https://registry.npmjs.org"
cache: 'npm'

- name: Install depedencies
run: npm ci

- name: Build depedencies
run: npm build

- name: Publish package
run: npm publish
env:
Expand Down
Loading

0 comments on commit 4f2b896

Please sign in to comment.