Skip to content

Commit 1feba5c

Browse files
authored
Update splunk version while fixing CI issues (#108)
* Fix issue with pipeline failing due to missing mypy * Update splunk version since we updated the flare sdk version * Improve removal of incomapatible binaries from vendored folders
1 parent 826f82a commit 1feba5c

5 files changed

Lines changed: 16 additions & 7 deletions

File tree

.github/workflows/pipeline.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ jobs:
3333
runs-on: ubuntu-latest
3434
needs: build
3535
steps:
36+
- name: Set up Python
37+
uses: actions/setup-python@v5
38+
with:
39+
python-version: '3.9'
40+
3641
- name: Download Build Artifact
3742
uses: actions/download-artifact@v4
3843
with:

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ venv: requirements.txt
1717
@rm -rf packages/flare/bin/vendor/bin
1818
@rm -rf packages/flare/bin/vendor/packaging
1919
@rm -rf packages/flare/bin/vendor/*-stubs
20-
@rm -rf packages/flare/bin/vendor/charset_normalizer/md.cpython-39-x86_64-linux-gnu.so
21-
@rm -rf packages/flare/bin/vendor/charset_normalizer/md__mypyc.cpython-39-x86_64-linux-gnu.so
20+
@find packages/flare/bin/vendor -type f -name "*x86_64-linux-gnu.so" -delete
2221

2322
venv-tools: requirements.tools.txt venv
2423
rm -rf venv-tools
@@ -58,8 +57,9 @@ publish: output/flare.tar.gz
5857
validate: venv-tools
5958
@echo "Running Splunk AppInspect..."
6059
@echo "If you get an error about \"libmagic\", run \"brew install libmagic\""
61-
@venv-tools/bin/splunk-appinspect inspect --ci "output/flare" || \
62-
if test "$$?" -eq "102" || "$$?" -eq "103" ; then \
60+
@venv-tools/bin/splunk-appinspect inspect --ci "output/flare" ; \
61+
status=$$? ; \
62+
if [ "$$status" -eq 0 ] || [ "$$status" -eq 102 ] || [ "$$status" -eq 103 ] ; then \
6363
exit 0 ; \
6464
else \
6565
exit 1 ; \

RELEASE_NOTES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# Flare
2+
1.3.4
3+
-----
4+
* Update the minimum version of the Flare SDK.
5+
26
1.3.3
37
-----
48
* Bump the version number and to update the splunkbase listing to support Splunk v10.

packages/flare/src/main/resources/splunk/default/app.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ id = flare
1313
python.version = python3.9
1414
state_change_requires_restart = true
1515
is_configured = 0
16-
build = 10
16+
build = 11
1717

1818
[ui]
1919
is_visible = 1
@@ -24,7 +24,7 @@ supported_themes = light, dark
2424
[launcher]
2525
author = Flare Systems
2626
description = The Flare app allows you to integrate your Flare alerts with the Splunk platform.
27-
version = 1.3.3
27+
version = 1.3.4
2828

2929
[triggers]
3030
reload.splunk_create = simple

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ requests==2.30.0
22
splunk-sdk==2.0.2
33
types-requests==2.30.0.0
44
urllib3==1.26.15
5-
flareio>=0.1.25
5+
flareio>=2.4.1

0 commit comments

Comments
 (0)