Skip to content

Commit 8cdae37

Browse files
authored
Use make yara-x-compile in CI (#942)
* Use make yara-x-compile in CI Signed-off-by: egibs <20933572+egibs@users.noreply.github.com> * Consistency Signed-off-by: egibs <20933572+egibs@users.noreply.github.com> --------- Signed-off-by: egibs <20933572+egibs@users.noreply.github.com>
1 parent 332c159 commit 8cdae37

2 files changed

Lines changed: 6 additions & 13 deletions

File tree

.github/workflows/style.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,9 @@ jobs:
2929
with:
3030
persist-credentials: false
3131

32-
- name: Install yara-x
33-
run: |
34-
wget https://github.com/VirusTotal/yara-x/releases/download/v0.15.0/yara-x-v0.15.0-x86_64-unknown-linux-gnu.gz -O yara-x.gz
35-
tar -xzvf yara-x.gz && mv yr /usr/local/bin/ && rm yara-x.gz
36-
- name: Verify yr installation
37-
run: |
38-
yr --version
39-
- name: Run yr compile
32+
- name: Run make yara-x-compile
4033
run: |
41-
yr compile --path-as-namespace -w rules/
34+
make yara-x-compile
4235
ret=$?
4336
if [[ $ret -ne 0 ]]; then
4437
echo "Rule compilation failed; address findings and commit the changes"

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ YARA_X_BIN := $(LINT_ROOT)/out/linters/yr-$(YARA_X_VERSION)-$(LINT_ARCH)
6363
$(YARA_X_BIN):
6464
mkdir -p $(LINT_ROOT)/out/linters
6565
rm -rf $(LINT_ROOT)/out/linters/yr
66-
curl -sSfL https://github.com/VirusTotal/yara-x/releases/download/$(YARA_X_VERSION)/yara-x-$(YARA_X_VERSION)-$(LINT_ARCH)-$(LINT_PLATFORM)-$(LINT_OS_LOWER)$(LINT_PLATFORM_SUFFIX).gz -o yara-x.gzip
67-
echo "$(YARA_X_SHA) *yara-x.gzip" | shasum -a 256 --check
68-
tar -xzvf yara-x.gzip && mv yr $(LINT_ROOT)/out/linters && rm yara-x.gzip
66+
curl -sSfL https://github.com/VirusTotal/yara-x/releases/download/$(YARA_X_VERSION)/yara-x-$(YARA_X_VERSION)-$(LINT_ARCH)-$(LINT_PLATFORM)-$(LINT_OS_LOWER)$(LINT_PLATFORM_SUFFIX).gz -o yara-x.gz
67+
echo "$(YARA_X_SHA) *yara-x.gz" | shasum -a 256 --check
68+
tar -xzvf yara-x.gz && mv yr $(LINT_ROOT)/out/linters && rm yara-x.gz
6969
mv $(LINT_ROOT)/out/linters/yr $@
7070

7171
LINTERS += golangci-lint-lint
@@ -81,7 +81,7 @@ yara-x-fmt: $(YARA_X_BIN)
8181
find rules -type f -name "*.yara" -execdir "$(YARA_X_BIN)" fmt {} \;
8282

8383
yara-x-compile: $(YARA_X_BIN)
84-
"$(YARA_X_BIN)" compile ./rules/
84+
"$(YARA_X_BIN)" compile --path-as-namespace -w rules/
8585

8686
.PHONY: _lint $(LINTERS)
8787
_lint: $(LINTERS)

0 commit comments

Comments
 (0)