Skip to content

Commit 548535f

Browse files
authored
Merge pull request #10 from Akshat-Raj/final
fix: build from checked-out source, not stale desktop copy
2 parents ecba52d + 84bb8f3 commit 548535f

1 file changed

Lines changed: 17 additions & 19 deletions

File tree

.github/workflows/shieldci.yml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,61 +31,59 @@ jobs:
3131
fi
3232
echo "commit_msg=$(git log -1 --pretty=%s 2>/dev/null || echo 'scan')" >> "$GITHUB_OUTPUT"
3333
34-
- name: Build ShieldCI engine
34+
- name: Build ShieldCI engine from checked-out source
3535
run: |
36-
cd "$HOME/Desktop/ShieldCI"
36+
cd "$GITHUB_WORKSPACE"
3737
cargo build --release
3838
3939
- name: Check ShieldCI engine is available
4040
run: |
41-
if [ ! -f "$HOME/Desktop/ShieldCI/target/release/shield-ci" ]; then
42-
echo "ERROR: ShieldCI engine not found"
41+
if [ ! -f "$GITHUB_WORKSPACE/target/release/shield-ci" ]; then
42+
echo "ERROR: ShieldCI engine not found after build"
4343
exit 1
4444
fi
4545
46-
- name: Copy shieldci.yml config
46+
- name: Build Kali Docker image
4747
run: |
48-
if [ -f "shieldci.yml" ]; then
49-
cp shieldci.yml "$HOME/Desktop/ShieldCI/tests/shieldci.yml"
50-
fi
48+
cd "$GITHUB_WORKSPACE"
49+
docker build -t shieldci-kali-image .
5150
52-
- name: Copy target repo to engine
51+
- name: Install test app dependencies
5352
run: |
54-
rm -rf "$HOME/Desktop/ShieldCI/tests/repo"
55-
cp -r "$GITHUB_WORKSPACE" "$HOME/Desktop/ShieldCI/tests/repo"
53+
cd "$GITHUB_WORKSPACE/tests"
54+
npm install
5655
5756
- name: Run ShieldCI engine
5857
id: scan
5958
run: |
6059
START_TIME=$(date +%s)
61-
cd "$HOME/Desktop/ShieldCI/tests"
62-
"$HOME/Desktop/ShieldCI/target/release/shield-ci" 2>&1 | tee scan_output.log || true
60+
cd "$GITHUB_WORKSPACE/tests"
61+
"$GITHUB_WORKSPACE/target/release/shield-ci" 2>&1 | tee scan_output.log || true
6362
END_TIME=$(date +%s)
6463
echo "duration=$((END_TIME - START_TIME))s" >> "$GITHUB_OUTPUT"
6564
6665
- name: Push results to ShieldCI dashboard
6766
if: always()
6867
env:
69-
SHIELDCI_API_URL: http://localhost:3000
70-
SHIELDCI_API_KEY: fc09420a3737855a3094ff7831a6219565cee6777a0fbeec
68+
SHIELDCI_API_URL: ${{ secrets.SHIELDCI_API_URL }}
69+
SHIELDCI_API_KEY: ${{ secrets.SHIELDCI_API_KEY }}
7170
SHIELDCI_REPO: ${{ steps.meta.outputs.repo }}
7271
SHIELDCI_BRANCH: ${{ steps.meta.outputs.branch }}
7372
SHIELDCI_COMMIT: ${{ steps.meta.outputs.commit }}
7473
SHIELDCI_COMMIT_MSG: ${{ steps.meta.outputs.commit_msg }}
7574
SHIELDCI_DURATION: ${{ steps.scan.outputs.duration }}
7675
SHIELDCI_TRIGGERED_BY: ${{ steps.meta.outputs.trigger }}
77-
SHIELDCI_RESULTS_FILE: ${{ runner.temp }}/../../../Desktop/ShieldCI/tests/shield_results.json
76+
SHIELDCI_RESULTS_FILE: ${{ github.workspace }}/tests/shield_results.json
7877
run: |
79-
export SHIELDCI_RESULTS_FILE="$HOME/Desktop/ShieldCI/tests/shield_results.json"
80-
python3 "$HOME/Desktop/ShieldCI/push_results.py"
78+
python3 "$GITHUB_WORKSPACE/push_results.py"
8179
8280
- name: Post scan summary as PR comment
8381
if: github.event_name == 'pull_request'
8482
uses: actions/github-script@v7
8583
with:
8684
script: |
8785
const fs = require('fs');
88-
const reportPath = process.env.HOME + '/Desktop/ShieldCI/tests/SHIELD_REPORT.md';
86+
const reportPath = process.env.GITHUB_WORKSPACE + '/tests/SHIELD_REPORT.md';
8987
let report = 'Scan completed but no report was generated.';
9088
try {
9189
report = fs.readFileSync(reportPath, 'utf8');

0 commit comments

Comments
 (0)