From b9317cc1e828dc813d6e54cb763970faaf06ff87 Mon Sep 17 00:00:00 2001 From: Phil Rzewski Date: Thu, 14 Jan 2021 20:14:35 +0000 Subject: [PATCH] Fix macOS build problem due to new LZ4 release (#60) --- .github/workflows/macos-build.yaml | 6 ------ .github/workflows/ubuntu-build.yaml | 6 ------ .github/workflows/windows-build.yaml | 6 ------ Makefile-macOS.brim | 2 +- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/.github/workflows/macos-build.yaml b/.github/workflows/macos-build.yaml index 4946738..520d478 100644 --- a/.github/workflows/macos-build.yaml +++ b/.github/workflows/macos-build.yaml @@ -13,12 +13,6 @@ jobs: runs-on: macos-10.15 steps: - uses: actions/checkout@v2 - - name: Setup Google Cloud Platform - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - version: '290.0.1' - project_id: ${{ secrets.GCLOUD_PROJECT_ID }} - service_account_key: ${{ secrets.GCLOUD_CREDENTIAL_BRIMSEC_BUCKET }} - name: install deps run: | brew install rust pkg-config diff --git a/.github/workflows/ubuntu-build.yaml b/.github/workflows/ubuntu-build.yaml index 256de0c..9393c61 100644 --- a/.github/workflows/ubuntu-build.yaml +++ b/.github/workflows/ubuntu-build.yaml @@ -13,12 +13,6 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - - name: Setup Google Cloud Platform - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - version: '290.0.1' - project_id: ${{ secrets.GCLOUD_PROJECT_ID }} - service_account_key: ${{ secrets.GCLOUD_CREDENTIAL_BRIMSEC_BUCKET }} - name: install deps run: | sudo apt-get update diff --git a/.github/workflows/windows-build.yaml b/.github/workflows/windows-build.yaml index 4c42685..c679d98 100644 --- a/.github/workflows/windows-build.yaml +++ b/.github/workflows/windows-build.yaml @@ -22,12 +22,6 @@ jobs: run: echo 'C:\msys64\usr\bin' >> $GITHUB_PATH - name: Add mingw64 bin path run: echo "/mingw64/bin" >> $GITHUB_PATH - - name: Setup Google Cloud Platform - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - version: '290.0.1' - project_id: ${{ secrets.GCLOUD_PROJECT_ID }} - service_account_key: ${{ secrets.GCLOUD_CREDENTIAL_BRIMSEC_BUCKET }} - name: install deps run: | pacman -Su --noconfirm libyaml-devel pcre-devel jansson-devel diff --git a/Makefile-macOS.brim b/Makefile-macOS.brim index f36e9f8..f053449 100644 --- a/Makefile-macOS.brim +++ b/Makefile-macOS.brim @@ -8,4 +8,4 @@ nspr_libs = /usr/local/opt/nspr/lib/libplc4.a /usr/local/opt/nspr/lib/libplds4.a suricata: $(suricata_OBJECTS) $(suricata_DEPENDENCIES) $(EXTRA_suricata_DEPENDENCIES) @rm -f suricata$(EXEEXT) - $(AM_V_CCLD)$(suricata_LINK) $(suricata_OBJECTS) $(suricata_LDADD) /usr/local/Cellar/jansson/2.13.1/lib/libjansson.a /usr/local/Cellar/bzip2/1.0.8/lib/libbz2.a /usr/local/Cellar/libmagic/5.39/lib/libmagic.a /usr/local/Cellar/lz4/1.9.2/lib/liblz4.a /usr/local/Cellar/libnet/1.2/lib/libnet.a $(nss_libs) $(nspr_libs) /usr/local/Cellar/pcre/8.44/lib/libpcre.a /usr/local/Cellar/libyaml/0.2.5/lib/libyaml.a $(LIBS) + $(AM_V_CCLD)$(suricata_LINK) $(suricata_OBJECTS) $(suricata_LDADD) /usr/local/Cellar/jansson/2.13.1/lib/libjansson.a /usr/local/Cellar/bzip2/1.0.8/lib/libbz2.a /usr/local/Cellar/libmagic/5.39/lib/libmagic.a /usr/local/Cellar/lz4/1.9.3/lib/liblz4.a /usr/local/Cellar/libnet/1.2/lib/libnet.a $(nss_libs) $(nspr_libs) /usr/local/Cellar/pcre/8.44/lib/libpcre.a /usr/local/Cellar/libyaml/0.2.5/lib/libyaml.a $(LIBS)