Skip to content

Commit efc3612

Browse files
committed
Fixes for .github/workflows/**
1 parent 85479aa commit efc3612

File tree

2 files changed

+22
-72
lines changed

2 files changed

+22
-72
lines changed

.github/workflows/cds-extractor-dist-bundle.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CDS Extractor Distribution Bundle
33
on:
44
push:
55
branches: [ main ]
6-
paths:
6+
paths:
77
- 'extractors/cds/**'
88
pull_request:
99
branches: [ main ]
@@ -16,30 +16,30 @@ jobs:
1616
bundle-validation:
1717
name: CDS extractor bundle validation
1818
runs-on: ubuntu-latest
19-
19+
2020
steps:
2121
- name: Checkout repository
2222
uses: actions/checkout@v5
23-
23+
2424
- name: Setup Node.js
2525
uses: actions/setup-node@v6
2626
with:
27-
node-version: '20'
2827
cache: 'npm'
2928
cache-dependency-path: 'extractors/cds/tools/package-lock.json'
30-
29+
node-version-file: 'extractors/cds/tools/package.json'
30+
3131
- name: Install node dependencies
3232
working-directory: extractors/cds/tools
3333
run: npm ci
34-
34+
3535
- name: Run TS code linter
3636
working-directory: extractors/cds/tools
3737
run: npm run lint
38-
38+
3939
- name: Run TS code unit tests with coverage report
4040
working-directory: extractors/cds/tools
4141
run: npm run test:coverage
42-
42+
4343
- name: Build and validate the CDS extractor bundle
4444
working-directory: extractors/cds/tools
4545
run: npm run build:validate

.github/workflows/copilot-setup-steps.yml

Lines changed: 14 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -33,94 +33,44 @@ jobs:
3333
- name: Checkout repository
3434
uses: actions/checkout@v5
3535

36-
- name: Install QLT
37-
id: install-qlt
38-
uses: advanced-security/codeql-development-toolkit/.github/actions/install-qlt@main
36+
- name: Copilit Setup Steps - Install codeql and qlt
37+
id: setup-codeql-environment
38+
uses: advanced-security/codeql-development-template/.github/actions/setup-codeql-environment@main
3939
with:
40-
qlt-version: 'latest'
41-
add-to-path: true
40+
install-codeql: true
41+
install-language-runtimes: false
42+
install-ql-packs: false
4243

43-
- name: Install CodeQL
44-
id: install-codeql
45-
shell: bash
46-
run: |
47-
echo "Installing CodeQL using configuration from qlt.conf.json"
48-
qlt codeql run install
49-
echo "-----------------------------"
50-
51-
# Get CodeQL paths from QLT
52-
CODEQL_HOME=$(qlt codeql get home)
53-
CODEQL_PATH=$(qlt codeql get path)
54-
55-
echo "CodeQL Home: $CODEQL_HOME"
56-
echo "CodeQL Binary: $CODEQL_PATH"
57-
58-
# Add CodeQL to PATH for subsequent steps
59-
if [[ -n "$CODEQL_HOME" ]]; then
60-
echo "$CODEQL_HOME" >> "$GITHUB_PATH"
61-
echo "✅ Added CodeQL to PATH: $CODEQL_HOME"
62-
else
63-
echo "❌ CodeQL home path not found"
64-
exit 1
65-
fi
66-
67-
- name: Verify CLI Tools in PATH
68-
shell: bash
69-
run: |
70-
echo "Verifying CLI tools are available in PATH:"
71-
72-
if ! command -v qlt >/dev/null 2>&1; then
73-
echo "❌ qlt not found in PATH"
74-
exit 1
75-
fi
76-
echo "✅ qlt is available: $(which qlt)"
77-
78-
if ! command -v codeql >/dev/null 2>&1; then
79-
echo "❌ codeql not found in PATH"
80-
exit 1
81-
fi
82-
echo "✅ codeql is available: $(which codeql)"
83-
84-
- name: Verify Versions of Tooling
85-
shell: bash
86-
run: |
87-
echo "Checking CodeQL Version:"
88-
codeql --version
89-
90-
echo "Checking QLT Version:"
91-
echo "QLT Home: ${{ steps.install-qlt.outputs.qlt-home }}"
92-
qlt version
93-
94-
- name: Install QL Packs
44+
- name: Copilot Setup Steps - Install QL packs
9545
shell: bash
9646
run: |
9747
echo "Installing QL pack dependencies"
9848
codeql pack install --no-strict-mode javascript/frameworks/cap
9949
codeql pack install --no-strict-mode javascript/frameworks/ui5
10050
codeql pack install --no-strict-mode javascript/frameworks/xsjs
10151
102-
- name: Setup Node.js for CDS Extractor
103-
uses: actions/setup-node@v4
52+
- name: Copilot Setup Steps - Setup NodeJS for CDS extractor
53+
uses: actions/setup-node@v6
10454
with:
105-
node-version: '20'
106-
cache: 'npm'
55+
cache: npm
10756
cache-dependency-path: extractors/cds/tools/package-lock.json
57+
node-version-file: extractors/cds/tools/package.json
10858

109-
- name: Install CDS Extractor Dependencies
59+
- name: Copilot Setup Steps - Install CDS Extractor Dependencies
11060
shell: bash
11161
working-directory: extractors/cds/tools
11262
run: |
11363
echo "Installing CDS extractor npm dependencies"
11464
npm ci
11565
116-
- name: Build CDS Extractor
66+
- name: Copilot Setup Steps - Build CDS extractor
11767
shell: bash
11868
working-directory: extractors/cds/tools
11969
run: |
12070
echo "Building CDS extractor"
12171
npm run build
12272
123-
- name: Verify Setup Complete
73+
- name: Copilot Setup Steps - Verify setup complete
12474
shell: bash
12575
run: |
12676
echo "✅ Setup complete and verified:"

0 commit comments

Comments
 (0)