-
-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into always-use-dbname
# Conflicts: # lib/db/clickhouse.js # lib/db/maintain/index.js # lib/db/maintain/scripts.js
- Loading branch information
Showing
129 changed files
with
20,156 additions
and
11,315 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # These are supported funding model platforms | ||
|
|
||
| custom: ['https://qryn.cloud'] | ||
| github: [qxip, lmangani] | ||
| github: [qxip] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,11 +18,7 @@ jobs: | |
| with: | ||
| ref: ${{ github.ref }} | ||
| - name: Update Package to Release version | ||
| uses: pocket-apps/action-update-version@v1 | ||
| with: | ||
| files: 'package.json' | ||
| version-regexp: '\d+.\d+.\d+' | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
| uses: technote-space/[email protected] | ||
| - name: Check NPM secret presence | ||
| id: checksecrets | ||
| shell: bash | ||
|
|
@@ -34,7 +30,7 @@ jobs: | |
| fi | ||
| env: | ||
| SECRET: ${{ secrets.NPM_TOKEN }} | ||
| - uses: actions/[email protected].0 | ||
| - uses: actions/[email protected].1 | ||
| if: ${{ steps.checksecrets.outputs.secretspresent }} | ||
| with: | ||
| node-version: 18 | ||
|
|
@@ -56,6 +52,8 @@ jobs: | |
| - uses: actions/[email protected] | ||
| with: | ||
| ref: ${{ github.ref }} | ||
| - name: Update Package to Release version | ||
| uses: technote-space/[email protected] | ||
| - name: Check Docker secret presence | ||
| id: checkdocker | ||
| shell: bash | ||
|
|
@@ -93,6 +91,10 @@ jobs: | |
| qxip/qryn:${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }} | ||
| qxip/cloki:latest | ||
| qxip/cloki:${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }} | ||
| labels: | | ||
| dev.qryn.image.title=qryn | ||
| dev.qryn.image.type=nodejs | ||
| dev.qryn.image.version={{github.event.inputs.TAG_NAME || github.event.release.tag_name }} | ||
| - name: Log in to the GHCR registry | ||
| uses: docker/[email protected] | ||
| with: | ||
|
|
@@ -108,6 +110,10 @@ jobs: | |
| tags: | | ||
| ghcr.io/metrico/qryn:latest | ||
| ghcr.io/metrico/qryn:${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }} | ||
| labels: | | ||
| dev.qryn.image.title=qryn | ||
| dev.qryn.image.type=nodejs | ||
| dev.qryn.image.version={{github.event.inputs.TAG_NAME || github.event.release.tag_name }} | ||
| bun: | ||
| name: 'Build & Publish Bun' | ||
|
|
@@ -117,6 +123,8 @@ jobs: | |
| - uses: actions/[email protected] | ||
| with: | ||
| ref: ${{ github.ref }} | ||
| - name: Update Package to Release version | ||
| uses: technote-space/[email protected] | ||
| - name: Check Docker secret presence | ||
| id: checkdocker | ||
| shell: bash | ||
|
|
@@ -135,35 +143,43 @@ jobs: | |
| platforms: amd64, arm64 | ||
| - name: Set up Docker Buildx | ||
| if: ${{ steps.checkdocker.outputs.secretspresent }} | ||
| uses: docker/setup-buildx-action@v1 | ||
| uses: docker/setup-buildx-action@v3.0.0 | ||
| - name: Login to DockerHub | ||
| if: ${{ steps.checkdocker.outputs.secretspresent }} | ||
| uses: docker/login-action@v2.0.0 | ||
| uses: docker/login-action@v3.0.0 | ||
| with: | ||
| username: ${{ secrets.DOCKERHUB_USERNAME }} | ||
| password: ${{ secrets.DOCKERHUB_TOKEN }} | ||
| - name: Build and push to Docker Hub (bun) | ||
| if: ${{ steps.checkdocker.outputs.secretspresent }} | ||
| uses: docker/build-push-action@v3.0.0 | ||
| uses: docker/build-push-action@v5.1.0 | ||
| with: | ||
| platforms: linux/amd64, linux/arm64 | ||
| file: ./Dockerfile_bun | ||
| push: true | ||
| tags: | | ||
| qxip/qryn:bun | ||
| qxip/qryn:${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }}-bun | ||
| labels: | | ||
| dev.qryn.image.title=qryn | ||
| dev.qryn.image.type=bun | ||
| dev.qryn.image.version={{github.event.inputs.TAG_NAME || github.event.release.tag_name }} | ||
| - name: Log in to the GHCR registry | ||
| uses: docker/[email protected] | ||
| with: | ||
| registry: ghcr.io | ||
| username: ${{ github.actor }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Build and push to GHCR (bun) | ||
| uses: docker/build-push-action@v5.0.0 | ||
| uses: docker/build-push-action@v5.1.0 | ||
| with: | ||
| platforms: linux/amd64, linux/arm64 | ||
| file: ./Dockerfile_bun | ||
| push: true | ||
| tags: | | ||
| ghcr.io/metrico/qryn:bun | ||
| ghcr.io/metrico/qryn:${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }}-bun | ||
| labels: | | ||
| dev.qryn.image.title=qryn | ||
| dev.qryn.image.type=bun | ||
| dev.qryn.image.version={{github.event.inputs.TAG_NAME || github.event.release.tag_name }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| # This workflow will validate qryn using nodejs + clickhouse | ||
|
|
||
| name: QRYN CI CLUSTER | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ master, beta ] | ||
| paths-ignore: | ||
| - '**.md' | ||
| - '**.yml' | ||
| - '**.yaml' | ||
| pull_request: | ||
| branches: [ master, beta ] | ||
| paths-ignore: | ||
| - '**.md' | ||
| - '**.yml' | ||
| - '**.yaml' | ||
| workflow_dispatch: | ||
| inputs: | ||
| clickhouse_tag: | ||
| description: 'Tag for ClickHouse (23.8-alpine)' | ||
| required: false | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| node-version: [18, 16.x, 20] | ||
| # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Use Node.js ${{ matrix.node-version }} | ||
| uses: actions/[email protected] | ||
| with: | ||
| node-version: ${{ matrix.node-version }} | ||
| cache: 'npm' | ||
| - run: npm install | ||
| - run: npm run postinstall | ||
| - run: git submodule init | ||
| - run: git submodule update | ||
| - run: docker-compose -f docker/e2e/docker-compose-cluster.yaml up -d | ||
| - run: sleep 5 | ||
| - name: Workflow Telemetry | ||
| uses: runforesight/[email protected] | ||
| if: github.event_name != 'pull_request' | ||
| - env: | ||
| CLICKHOUSE_DB: qryn | ||
| CLICKHOUSE_TSDB: qryn | ||
| INTEGRATION_E2E: 1 | ||
| CLOKI_EXT_URL: 127.0.0.1:3100 | ||
| run: CLUSTER_NAME=test_cluster_two_shards node qryn.mjs >/dev/stdout & sleep 10 && npm run test --forceExit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,7 +46,8 @@ jobs: | |
| - run: git submodule init | ||
| - run: git submodule update | ||
| - name: Workflow Telemetry | ||
| uses: runforesight/[email protected] | ||
| uses: runforesight/[email protected] | ||
| if: github.event_name != 'pull_request' | ||
| - env: | ||
| CLICKHOUSE_DB: qryn | ||
| CLICKHOUSE_TSDB: qryn | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.