Skip to content

Commit 6c0b084

Browse files
authored
Merge branch 'main' into additional_search_annotations
2 parents 5633363 + 9cc8853 commit 6c0b084

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/pushToPyPiOnRelease.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111

1212
#Checkout the current branch
1313
- name: Checkout repo
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
#Install the given version of Python we will test against
1717
- name: Install Required Python Version
18-
uses: actions/setup-python@v4
18+
uses: actions/setup-python@v5
1919
with:
2020
python-version: "3.9"
2121
architecture: "x64"

.github/workflows/testEndToEnd.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ jobs:
3030

3131
#Checkout the current branch
3232
- name: Checkout repo
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434

3535
#Install the given version of Python we will test against
3636
- name: Install Required Python Version
37-
uses: actions/setup-python@v4
37+
uses: actions/setup-python@v5
3838
with:
3939
python-version: ${{ matrix.python_version }}
4040
architecture: "x64"
@@ -69,7 +69,7 @@ jobs:
6969
cd my_splunk_content_pack
7070
poetry run contentctl test --unattended
7171
72-
- uses: actions/upload-artifact@v3
72+
- uses: actions/upload-artifact@v4
7373
with:
7474
name: content_pack_${{ matrix.python_version }}_${{ matrix.operating_system }}
7575
path: |

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "contentctl"
3-
version = "3.4.3"
3+
version = "3.5.0"
44
description = "Splunk Content Control Tool"
55
authors = ["STRT <[email protected]>"]
66
license = "Apache 2.0"

0 commit comments

Comments
 (0)