Skip to content

Commit e3d81a7

Browse files
authored
Merge branch 'develop' into auto-ta-update-167
2 parents 20495d6 + 70aa840 commit e3d81a7

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

.github/workflows/appinspect.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@ jobs:
1818

1919
- name: Install Python Dependencies and ContentCTL and Atomic Red Team
2020
run: |
21-
pip install contentctl==${{ vars.CONTENTCTL_VERSION }}
21+
if [ -n "${{ vars.CONTENTCTL_VERSION }}" ]; then
22+
echo "Installing contentctl version ${{ vars.CONTENTCTL_VERSION }}"
23+
pip install contentctl==${{ vars.CONTENTCTL_VERSION }}
24+
else
25+
echo "Installing latest contentctl version"
26+
pip install contentctl
27+
fi
2228
git clone --depth=1 --single-branch --branch=master https://github.com/redcanaryco/atomic-red-team.git external_repos/atomic-red-team
2329
git clone --depth=1 --single-branch --branch=master https://github.com/mitre/cti external_repos/cti
2430

.github/workflows/build.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,13 @@ jobs:
1919

2020
- name: Install Python Dependencies and ContentCTL and Atomic Red Team
2121
run: |
22-
echo "CONTENTCTL_VERSION is ${{ vars.CONTENTCTL_VERSION }}"
23-
pip install contentctl==${{ vars.CONTENTCTL_VERSION }}
22+
if [ -n "${{ vars.CONTENTCTL_VERSION }}" ]; then
23+
echo "Installing contentctl version ${{ vars.CONTENTCTL_VERSION }}"
24+
pip install contentctl==${{ vars.CONTENTCTL_VERSION }}
25+
else
26+
echo "Installing latest contentctl version"
27+
pip install contentctl
28+
fi
2429
git clone --depth=1 --single-branch --branch=master https://github.com/redcanaryco/atomic-red-team.git external_repos/atomic-red-team
2530
git clone --depth=1 --single-branch --branch=master https://github.com/mitre/cti external_repos/cti
2631

.github/workflows/unit-testing.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@ jobs:
2323
- name: Install Python Dependencies and ContentCTL
2424
run: |
2525
python -m pip install --upgrade pip
26-
pip install contentctl==${{ vars.CONTENTCTL_VERSION }}
26+
if [ -n "${{ vars.CONTENTCTL_VERSION }}" ]; then
27+
echo "Installing contentctl version ${{ vars.CONTENTCTL_VERSION }}"
28+
pip install contentctl==${{ vars.CONTENTCTL_VERSION }}
29+
else
30+
echo "Installing latest contentctl version"
31+
pip install contentctl
32+
fi
2733
2834
# Running contentctl test with a few arguments, before running the command make sure you checkout into the current branch of the pull request. This step only performs unit testing on all the changes against the target-branch. In most cases this target branch will be develop
2935
# Make sure we check out the PR, even if it actually lives in a fork

0 commit comments

Comments
 (0)