Skip to content

Commit

Permalink
Bump all 3rd-party deps and workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Haist committed Feb 20, 2024
1 parent a6e4a8f commit 76f8d07
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
build-linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.16

Expand All @@ -30,15 +30,15 @@ jobs:
run: make release VERSIONSUFFIX=+$GITHUB_SHA

- name: Upload a Build Artifact
uses: actions/upload-artifact@v2.2.4
uses: actions/upload-artifact@v4
with:
name: spyre-zips
path: spyre-*.zip

build-macosx:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Update build environment
run: |
Expand All @@ -58,7 +58,7 @@ jobs:
run: gmake release VERSIONSUFFIX=+$GITHUB_SHA

- name: Upload a Build Artifact
uses: actions/upload-artifact@v2.2.4
uses: actions/upload-artifact@v4
with:
name: spyre-macosx-zips
path: spyre-*.zip
12 changes: 6 additions & 6 deletions 3rdparty.mk
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ endef
3rdparty_JOBS := 8
3rdparty_TARGETS := yara musl openssl

yara_VERSION := 4.2.3
yara_VERSION := 4.5.0
yara_URL := https://github.com/VirusTotal/yara/archive/v$(yara_VERSION).tar.gz
yara_ARCHS := $(3rdparty_ARCHS)
# This is executed in the source directory
yara_PREP := ./bootstrap.sh

musl_VERSION := 1.2.3
musl_VERSION := 1.2.4
musl_URL := https://musl.libc.org/releases/musl-$(musl_VERSION).tar.gz
musl_ARCHS := $(filter %-linux-musl,$(3rdparty_ARCHS))

openssl_VERSION := 1.1.1t
openssl_VERSION := 1.1.1w
openssl_URL := https://www.openssl.org/source/openssl-$(openssl_VERSION).tar.gz
openssl_ARCHS := $(3rdparty_ARCHS)

Expand Down Expand Up @@ -131,9 +131,9 @@ _3rdparty/build/$1/yara-$(yara_VERSION)/.build-stamp: _3rdparty/src/yara-$(yara_
LDFLAGS="$$(shell PKG_CONFIG_PATH=$$(abspath _3rdparty/tgt/$1/lib/pkgconfig) \
pkg-config --static --libs libcrypto \
| $(SED) -e 's/-ldl//g' )"
$(MAKE) -s -C $$(@D)/libyara uninstall
$(MAKE) -s -j$(3rdparty_JOBS) -C $$(@D)/libyara
$(MAKE) -s -C $$(@D)/libyara install
$(MAKE) -s -C $$(@D) uninstall
$(MAKE) -s -j$(3rdparty_JOBS) -C $$(@D)
$(MAKE) -s -C $$(@D) install
$(if $(or $(findstring $(patsubst %-linux-gnu,%-linux-musl,$(3rdparty_NATIVE_ARCH)),$1),
$(findstring $(patsubst %-redhat-linux,%-linux-musl,$(3rdparty_NATIVE_ARCH)),$1)),\
mkdir -p _3rdparty/tgt/bin && ln -sf $(patsubst %,$(abspath _3rdparty/tgt/$1)/bin/%,yarac yara) _3rdparty/tgt//bin)
Expand Down

0 comments on commit 76f8d07

Please sign in to comment.