Updates in tests and automatic building scripts

refresh-bio · Sep 12, 2024 · d1c44e9 · d1c44e9
1 parent f9725b7
commit d1c44e9
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 17 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -28,15 +28,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        machine: [x64_linux, arm64_linux, x64_mac, arm64_mac]
+        machine: [x64_linux]
+        platform: [avx2]
+        compiler: [g++-13]
+        include:
+        - machine: arm64_linux
+          platform: arm8
+          compiler: g++-12
+        - machine: x64_mac
+          platform: avx2
+          compiler: g++-13
+        - machine: arm64_mac
+          platform: m1
+          compiler: g++-13
 
     runs-on: [self-hosted, lz-ani, '${{ matrix.machine }}']  
 
     steps:
     - name: make 
       run: |
         make clean
-        make -j32 CXX=g++-12
+        make -j32 CXX=${{matrix.compiler}} STATIC_LINK=true PLATFORM=${{ matrix.platform }}
     - name: tar artifacts
       run: tar -cvzf lz-ani.tar.gz lz-ani LICENSE
 
@@ -74,4 +86,4 @@ jobs:
         upload_url: ${{ github.event.release.upload_url }}
         asset_path: ./lz-ani.tar.gz
         asset_name: lz-ani-${{ github.event.release.tag_name }}-${{matrix.machine}}.tar.gz
-        asset_content_type: application/gzip
+        asset_content_type: application/gzip
diff --git a/.github/workflows/self-hosted.yml b/.github/workflows/self-hosted.yml
@@ -14,7 +14,7 @@ jobs:
     name: Checkout
     strategy:
       matrix:
-        machine: [tripper, arm64_linux, mac-i7, mac-m1]
+        machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
     runs-on: [self-hosted, lz-ani, '${{ matrix.machine }}']
 
     steps:
@@ -30,14 +30,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        machine: [tripper, arm64_linux, mac-i7, mac-m1]
-        compiler: [12]
+        machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
+        compiler: [g++-11, g++-12, g++-13]
+        include:
+        - machine: x64_linux
+          platform: avx2
+        - machine: arm64_linux
+          platform: arm8
+        - machine: x64_mac
+          platform: avx2
+        - machine: arm64_mac
+          platform: m1
+        exclude:
+        - machine: arm64_linux
+          compiler: g++-13
+
     runs-on: [self-hosted, lz-ani, '${{ matrix.machine }}']  
 
     steps:
-    - name: make (g++-${{matrix.compiler}})
+    - name: make
       run: | 
-        make -j32 CXX=g++-${{matrix.compiler}} 
+        make -j32 CXX=${{matrix.compiler}} PLATFORM=${{ matrix.platform }}
         cp ./lz-ani ./lz-ani-${{matrix.compiler}}
         make clean
         
@@ -48,15 +61,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        machine: [tripper, arm64_linux, mac-i7, mac-m1]
-        compiler: [12]
+        machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
+        compiler: [g++-11, g++-12, g++-13]
+        exclude:
+        - machine: arm64_linux
+          compiler: g++-13
+
     runs-on: [self-hosted, lz-ani, '${{ matrix.machine }}']
 
     env: 
       EXEC: ./lz-ani-${{matrix.compiler}}
 
     steps:
-    - name: help (g++-${{matrix.compiler}})
+    - name: help
       run: | 
        ${EXEC} 
 
@@ -68,8 +85,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        machine: [tripper, arm64_linux, mac-i7, mac-m1]
-        compiler: [12]
+        machine: [x64_linux, x64_mac, arm64_linux, arm64_mac]
+        compiler: [g++-11, g++-12, g++-13]
+        exclude:
+        - machine: arm64_linux
+          compiler: g++-13
+
     runs-on: [self-hosted, lz-ani, '${{ matrix.machine }}']
 
     env: 

diff --git a/src/defs.h b/src/defs.h
@@ -4,8 +4,8 @@
 //
 // Copyright(C) 2024-2024, S.Deorowicz, A.Gudys
 //
-// Version: 1.1.0
-// Date   : 2024-09-05
+// Version: 1.1.1
+// Date   : 2024-09-12
 // *******************************************************************************************
 
 #pragma once
@@ -15,8 +15,8 @@
 #include <string>
 #include "params.h"
 
-const std::string LZ_ANI_VER = "lz-ani 1.1.0";
-const std::string LZ_ANI_DATE = "2024-09-05";
+const std::string LZ_ANI_VER = "lz-ani 1.1.1";
+const std::string LZ_ANI_DATE = "2024-09-12";
 const std::string LZ_ANI_AUTHORS = "Sebastian Deorowicz, Adam Gudys";
 const std::string LZ_ANI_INFO = LZ_ANI_VER + " (" + LZ_ANI_DATE + ") by " + LZ_ANI_AUTHORS;