Skip to content

Commit

Permalink
Merge branch 'release/v0.16.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
targodan committed Jun 1, 2022
2 parents 87dc1d1 + 0bfe330 commit a499d60
Show file tree
Hide file tree
Showing 25 changed files with 1,353 additions and 641 deletions.
48 changes: 48 additions & 0 deletions .github/actions/install-yara/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: 'Install libyara'
description: 'Installs libyara and its dependencies'
inputs:
yara-version:
description: "Yara version"
required: true
cache:
description: "Activates caching if set to 'true'"
default: 'false'
required: false
skip-install:
description: "Yara is only built, not installed if 'true'"
default: 'false'
required: false
runs:
using: "composite"
steps:
- name: Install libyara dependencies
run: sudo apt-get update && sudo apt-get install -y libssl-dev libprotobuf-dev flex bison
shell: bash

- name: Create dependencies directory
run: mkdir -p deps
shell: bash

- name: Cache libyara
uses: actions/cache@v3
id: yara-cache
with:
path: deps
key: ${{ runner.os }}-yara-${{ inputs.yara-version }}
if: ${{ inputs.cache == 'true' }}

- name: Build libyara
run: |
git clone --depth=1 --branch ${{ inputs.yara-version }} https://github.com/VirusTotal/yara.git deps/yara
cd deps/yara
./bootstrap.sh
./configure --prefix=/usr --with-crypto || exit $?
make -j
shell: bash
if: ${{ inputs.cache != 'true' || steps.yara-cache.outputs.cache-hit != 'true' }}

- name: Install libyara
run: sudo make install
shell: bash
working-directory: deps/yara
if: ${{ inputs.skip-install != 'true' }}
129 changes: 41 additions & 88 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,79 +2,48 @@ name: CI

on:
push:
branches:
- master
- develop
branches: [ master , develop ]
pull_request:
branches:
- master
- develop
branches: [ master , develop ]

jobs:
setup:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
strategy:
matrix:
yara-version:
- v4.2.1
yara-version: [ "v4.2.1" ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install libyara dependencies
run: sudo apt-get update && sudo apt-get install -y libssl-dev libprotobuf-dev flex bison
- name: Cache libyara
uses: actions/cache@v2
id: yara-cache
- name: Build yara
uses: ./.github/actions/install-yara
with:
key: ${{ runner.os }}-yara-${{ matrix.yara-version }}
path: deps
- run: mkdir -p deps
- name: Build libyara
run: |
git clone --depth=1 --branch ${{ matrix.yara-version }} https://github.com/VirusTotal/yara.git deps/yara
cd deps/yara
./bootstrap.sh
./configure --prefix=/usr --with-crypto || exit $?
make -j
if: steps.yara-cache.outputs.cache-hit != 'true'
yara-version: ${{ matrix.yara-version }}
cache: 'true'
skip-install: 'true'

test:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
needs: setup
strategy:
matrix:
go-version:
- 1.18
yara-version:
- v4.2.1
go-version: [ "1.18" ]
yara-version: [ "v4.2.1" ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install libyara dependencies
run: sudo apt-get update && sudo apt-get install -y libssl-dev libprotobuf-dev flex bison
- name: Cache libyara
uses: actions/cache@v2
id: yara-cache
- name: Install dependencies
uses: ./.github/actions/install-yara
with:
key: ${{ runner.os }}-yara-${{ matrix.yara-version }}
path: deps
- run: mkdir -p deps
- name: Build libyara
run: |
git clone --depth=1 --branch ${{ matrix.yara-version }} https://github.com/VirusTotal/yara.git deps/yara
cd deps/yara
./bootstrap.sh
./configure --prefix=/usr --with-crypto || exit $?
make -j
if: steps.yara-cache.outputs.cache-hit != 'true'
- name: Install libyara
run: sudo make install
working-directory: deps/yara
yara-version: ${{ matrix.yara-version }}
cache: 'true'

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
cache: true
cache-dependency-path: go.sum

- name: Running unit tests
run: go test -race -coverprofile=coverage.txt -covermode=atomic -coverpkg="$coverpkg" -v $(go list ./... | grep -v /acceptanceTests)
Expand All @@ -88,68 +57,52 @@ jobs:
- name: Consolidating coverage
run: cat acceptanceTests/coverage.txt | tail -n+2 >> coverage.txt && rm acceptanceTests/coverage.txt
- name: Upload coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage-linux-${{ matrix.go-version }}-${{ matrix.yara-version }}
path: coverage.txt
- name: Codecov
uses: codecov/codecov-action@v1.5.2
uses: codecov/codecov-action@v3


build:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
needs: setup
strategy:
matrix:
go-version:
- 1.18
yara-version:
- v4.2.1
openssl-version:
- OpenSSL_1_1_1-stable
go-version: [ "1.18" ]
yara-version: [ "v4.2.1" ]
openssl-version: [ "OpenSSL_1_1_1-stable" ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v2
- name: Install dependencies
uses: ./.github/actions/install-yara
with:
go-version: ${{ matrix.go-version }}
yara-version: ${{ matrix.yara-version }}
cache: 'true'

- name: Install libyara dependencies
run: sudo apt-get update && sudo apt-get install -y libssl-dev libprotobuf-dev flex bison
- name: Cache libyara
uses: actions/cache@v2
id: yara-cache
- name: Set up Go
uses: actions/setup-go@v3
with:
key: ${{ runner.os }}-yara-${{ matrix.yara-version }}
path: deps
- run: mkdir -p deps
- name: Build libyara
run: |
git clone --depth=1 --branch ${{ matrix.yara-version }} https://github.com/VirusTotal/yara.git deps/yara
cd deps/yara
./bootstrap.sh
./configure --prefix=/usr --with-crypto || exit $?
make -j
if: steps.yara-cache.outputs.cache-hit != 'true'
- name: Install libyara
run: sudo make install
working-directory: deps/yara
go-version: ${{ matrix.go-version }}
cache: true
cache-dependency-path: go.sum

- run: mkdir -p cicd/build/
- name: Building yapscan for linux
run: go build -trimpath -o ../../cicd/build/yapscan
working-directory: cmd/yapscan
- name: Upload linux build
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: yapscan-linux
path: cicd/build/yapscan

- name: Gather linux deps
uses: ./.github/actions/gather-linux-deps
- name: Upload linux deps
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: deps-linux
path: |
Expand All @@ -158,7 +111,7 @@ jobs:
cicd/build/libyara.license
- name: Docker Login
uses: docker/login-action@v1.10.0
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand All @@ -172,7 +125,7 @@ jobs:
openssl-version: ${{ matrix.openssl-version }}
yara-version: ${{ matrix.yara-version }}
- name: Upload windows build
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: yapscan-windows
path: |
Expand Down
78 changes: 78 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ master, develop ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master, develop ]
schedule:
- cron: '40 14 * * 0'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'go' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
yara-version: [ 'v4.2.1' ]

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Install dependencies
uses: ./.github/actions/install-yara
with:
yara-version: ${{ matrix.yara-version }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
Loading

0 comments on commit a499d60

Please sign in to comment.