Merge branch 'master' into always-use-dbname

Signed-off-by: Lorenzo Mangani <[email protected]>

.github/workflows/bump_version.yml → .github/workflows/build_release.yml

@@ -1,39 +1,29 @@
-name: 'Build Multi-Arch'
+name: 'CI+CD'
 
 on:
-  push:
-    branches:
-      - 'master'
-    paths-ignore:
-      - '**.md'
-      - '**.yml'
-      - '**.yaml'
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      TAG_NAME:
+        description: 'Release Version Tag (0.0.0)'
+        required: true
 
 jobs:
-  bump-version:
-    name: 'Bump Version on master & Publish'
+  build:
+    name: 'Build & Publish'
     runs-on: ubuntu-latest
 
     steps:
-      - name: 'Checkout source code'
-        uses: 'actions/checkout@v2'
+      - uses: 'actions/checkout@v3'
         with:
           ref: ${{ github.ref }}
-      - name: 'cat package.json'
-        run: cat ./package.json
-      - name: 'Automated Version Bump'
-        id: version-bump
-        uses: 'phips28/gh-action-bump-version@master'
+      - name: Update Package to Release version
+        uses: pocket-apps/action-update-version@v1
         with:
-          tag-prefix: 'v'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: 'cat package.json'
-        run: cat ./package.json
-      - name: 'Output Step'
-        env:
-          NEW_TAG: ${{ steps.version-bump.outputs.newTag }}
-        run: echo "new tag $NEW_TAG"
+          files: 'package.json'
+          version-regexp: '\d+.\d+.\d+'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Check NPM secret presence
         id: checksecrets
         shell: bash
@@ -45,10 +35,10 @@ jobs:
           fi
         env:
           SECRET: ${{ secrets.NPM_TOKEN }}
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4.0.0
         if: ${{ steps.checksecrets.outputs.secretspresent }}
         with:
-          node-version: 14
+          node-version: 18
       - name: Publish to NPM
         if: ${{ steps.checksecrets.outputs.secretspresent }}
         run: |
@@ -84,18 +74,31 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}  
+
       - name: Build and push to Docker Hub
         if: ${{ steps.checkdocker.outputs.secretspresent }}
-        id: docker_build
         uses: docker/[email protected]
         with:
           platforms: linux/amd64, linux/arm64
           push: true
           tags: |
             qxip/qryn:latest
-            qxip/qryn:${{ steps.version-bump.outputs.newTag }}
+            qxip/qryn:${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }}
             qxip/cloki:latest
-            qxip/cloki:${{ steps.version-bump.outputs.newTag }}
+            qxip/cloki:${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }}
+            
+      - name: Build and push to Docker Hub (bun)
+        if: ${{ steps.checkdocker.outputs.secretspresent }}
+        uses: docker/[email protected]
+        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
+            qxip/cloki:bun
+            qxip/cloki:${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }}-bun
             
       - name: Log in to the GHCR registry
         uses: docker/[email protected]
@@ -108,7 +111,18 @@ jobs:
         uses: docker/[email protected]
         with:
           platforms: linux/amd64, linux/arm64
+          file: ./Dockerfile
           push: true
           tags: |
              ghcr.io/metrico/qryn:latest
-             ghcr.io/metrico/qryn:${{ steps.version-bump.outputs.newTag }}
+             ghcr.io/metrico/qryn:${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }}
+
+      - name: Build and push to GHCR (bun)
+        uses: docker/[email protected]
+        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

.github/workflows/node-clickhouse.js.yml

@@ -23,7 +23,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18, 16.x]
+        node-version: [18, 16.x, 20]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -43,4 +43,4 @@ jobs:
         CLICKHOUSE_TSDB: loki
         INTEGRATION_E2E: 1
         CLOKI_EXT_URL: 127.0.0.1:3100
-      run: node qryn.js >/dev/stdout & npm run test --forceExit
+      run: node qryn.mjs >/dev/stdout & npm run test --forceExit

.gitignore

@@ -4,3 +4,8 @@ node_modules
 /test/e2e/
 /lib/influx/.idea/
 /lib/influx/influx.iml
+/wasm_parts/_vendor.zip
+/wasm_parts/.idea/
+/wasm_parts/vendor/
+/wasm_parts/main.wasm
+/wasm_parts/wasm_parts.iml

Dockerfile_bun

@@ -0,0 +1,15 @@
+# qryn bun builder
+FROM oven/bun:alpine
+
+# BUILD FORCE
+ENV BUILD 20231027
+ENV PORT 3100
+
+COPY . /app
+WORKDIR /app
+RUN rm -rf package-lock.json
+RUN bun install
+
+# Expose Ports
+EXPOSE 3100
+CMD [ "bun", "qryn.mjs" ]