Upd version

thingsdb · Apr 26, 2024 · c006c4d · c006c4d
2 parents c7f3ac5 + a833d6b
commit c006c4d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -64,11 +64,18 @@ jobs:
         tags: ghcr.io/thingsdb/node:${{ steps.get_version.outputs.VERSION }}
         labels: ${{ steps.meta.outputs.labels }}
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
     - name: Build and push Docker image (arm64)
       uses: docker/build-push-action@v5
       with:
         context: .
         push: true
         file: docker/arm64.Dockerfile
         tags: ghcr.io/thingsdb/node:arm64-${{ steps.get_version.outputs.VERSION }}
+        platforms: linux/amd64,linux/arm64/v8
         labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,7 +44,7 @@ jobs:
         context: .
         push: true
         file: docker/gcloud.Dockerfile
-        tags: ghcr.io/thingsdb/node:gcloud-${{ steps.get_version.outputs.VERSION }}
+        tags: ghcr.io/thingsdb/node:gcloud-${{ steps.get_version.outputs.VERSION }},ghcr.io/thingsdb/node:gcloud
         labels: ${{ steps.meta.outputs.labels }}
 
     - name: Build and push Docker image (full)
@@ -53,7 +53,7 @@ jobs:
         context: .
         push: true
         file: docker/full.Dockerfile
-        tags: ghcr.io/thingsdb/node:full-${{ steps.get_version.outputs.VERSION }}
+        tags: ghcr.io/thingsdb/node:full-${{ steps.get_version.outputs.VERSION }},ghcr.io/thingsdb/node:full
         labels: ${{ steps.meta.outputs.labels }}
 
     - name: Build and push Docker image (minimal)
@@ -65,11 +65,18 @@ jobs:
         tags: ghcr.io/thingsdb/node:${{ steps.get_version.outputs.VERSION }},ghcr.io/thingsdb/node:latest
         labels: ${{ steps.meta.outputs.labels }}
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
     - name: Build and push Docker image (arm64)
       uses: docker/build-push-action@v5
       with:
         context: .
         push: true
         file: docker/arm64.Dockerfile
-        tags: ghcr.io/thingsdb/node:arm64-${{ steps.get_version.outputs.VERSION }}
+        tags: ghcr.io/thingsdb/node:arm64-${{ steps.get_version.outputs.VERSION }},ghcr.io/thingsdb/node:arm64
+        platforms: linux/amd64,linux/arm64/v8
         labels: ${{ steps.meta.outputs.labels }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.6.1
+
+* Add support for ARM64 container, pr #377 (@rickmoonex).
+
 # v1.6.0
 
 * Listen to `THINGSDB_INIT`, `THINGSDB_SECRET` and `THINGSDB_DEPLOY` environment variable.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,6 +31,10 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-type-limits")
 
+# Turn off AVX and BMI2 instructions for legacy systems
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mno-avx")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mno-bmi2")
+
 # Include directories for MacOS build
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
    include_directories(

diff --git a/inc/ti/version.h b/inc/ti/version.h
@@ -25,7 +25,7 @@
  *  "-rc0"
  *  ""
  */
-#define TI_VERSION_PRE_RELEASE "-alpha0"
+#define TI_VERSION_PRE_RELEASE "-alpha2"
 
 #define TI_MAINTAINER \
     "Jeroen van der Heijden <[email protected]>"