Merge branch 'release/v0.19.3'

fkie-cad · Jun 7, 2023 · 5e7d582 · 5e7d582
2 parents eb2fa6d + 220b70b
commit 5e7d582
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                yara-version: [ "v4.2.3" ]
+                yara-version: [ "v4.3.1" ]
         steps:
             - uses: actions/checkout@v3
 
@@ -28,8 +28,8 @@ jobs:
         needs: setup
         strategy:
             matrix:
-                go-version: [ "1.18", "1.19" ]
-                yara-version: [ "v4.2.3" ]
+                go-version: [ "1.18", "1.19", "1.20" ]
+                yara-version: [ "v4.3.1" ]
         steps:
             - uses: actions/checkout@v3
 
@@ -70,8 +70,8 @@ jobs:
         needs: setup
         strategy:
             matrix:
-                go-version: [ "1.18", "1.19" ]
-                yara-version: [ "v4.2.3" ]
+                go-version: [ "1.18", "1.19", "1.20" ]
+                yara-version: [ "v4.3.1" ]
                 openssl-version: [ "OpenSSL_1_1_1-stable" ]
         steps:
             - uses: actions/checkout@v3
@@ -95,7 +95,7 @@ jobs:
               working-directory: cmd/yapscan
             - name: Upload linux build
               uses: actions/upload-artifact@v3
-              if: ${{ matrix.go-version == '1.19' }}
+              if: ${{ matrix.go-version == '1.20' }}
               with:
                   name: yapscan-linux
                   path: cicd/build/yapscan
@@ -104,7 +104,7 @@ jobs:
               uses: ./.github/actions/gather-linux-deps
             - name: Upload linux deps
               uses: actions/upload-artifact@v3
-              if: ${{ matrix.go-version == '1.19' }}
+              if: ${{ matrix.go-version == '1.20' }}
               with:
                   name: deps-linux
                   path: |
@@ -118,8 +118,8 @@ jobs:
         if: github.event_name != 'pull_request' # pull_request events don't have access to secrets
         strategy:
             matrix:
-                go-version: [ "1.18", "1.19" ]
-                yara-version: [ "v4.2.3" ]
+                go-version: [ "1.18", "1.19", "1.20" ]
+                yara-version: [ "v4.3.1" ]
                 openssl-version: [ "OpenSSL_1_1_1-stable" ]
         steps:
             - uses: actions/checkout@v3
@@ -141,7 +141,7 @@ jobs:
                   go-version: ${{ matrix.go-version }}
             - name: Upload windows build
               uses: actions/upload-artifact@v3
-              if: ${{ matrix.go-version == '1.19' }}
+              if: ${{ matrix.go-version == '1.20' }}
               with:
                   name: yapscan-windows
                   path: |

diff --git a/cicd/yaraVersion.sh b/cicd/yaraVersion.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEFAULT_VERSION=v4.2.3
+DEFAULT_VERSION=v4.3.1
 YARA_VERSION=${YARA_VERSION:-$DEFAULT_VERSION}
 
 echo "$YARA_VERSION"
diff --git a/version/version.go b/version/version.go
@@ -10,7 +10,7 @@ import (
 var YapscanVersion = Version{
 	Major:  0,
 	Minor:  19,
-	Bugfix: 1,
+	Bugfix: 3,
 }
 
 type Version struct {