Skip to content

Commit d8c0510

Browse files
committed
fix: resolve actionlint and shellcheck issues
- Add validate-workflows job to CI pipeline - Fix duplicate 'uses' fields in all workflow files - Fix codecov action input parameter (file -> files) - Fix shell script issues: * Replace problematic glob test with ls command * Fix exit code checks to use command directly * Fix quoting issues in user_data.sh * Remove unused INSTANCE_ID variable Significantly reduces actionlint and shellcheck warnings while maintaining functionality.
1 parent 3572107 commit d8c0510

6 files changed

Lines changed: 33 additions & 29 deletions

File tree

.github/workflows/ci.yml

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
steps:
2626
- name: Checkout code
2727
uses: actions/checkout@v5
28-
uses: actions/checkout@v5
2928

3029
- name: Install yq
3130
uses: mikefarah/yq@master
@@ -76,6 +75,32 @@ jobs:
7675
make quality-check
7776
fi
7877
78+
validate-workflows:
79+
name: Validate Workflows
80+
runs-on: ubuntu-latest
81+
needs: get-config
82+
83+
steps:
84+
- name: Checkout code
85+
uses: actions/checkout@v5
86+
87+
- name: Install yq
88+
uses: mikefarah/yq@master
89+
90+
- name: Set up Python
91+
uses: actions/setup-python@v5
92+
with:
93+
python-version: ${{ needs.get-config.outputs.default-python-version }}
94+
95+
- name: Install UV
96+
uses: astral-sh/setup-uv@v6
97+
with:
98+
enable-cache: true
99+
cache-dependency-glob: "pyproject.toml.template"
100+
101+
- name: Validate workflows
102+
run: make validate-all
103+
79104
lint-black:
80105
name: Black (Code Formatting)
81106
runs-on: ubuntu-latest
@@ -84,7 +109,6 @@ jobs:
84109
steps:
85110
- name: Checkout code
86111
uses: actions/checkout@v5
87-
uses: actions/checkout@v5
88112

89113
- name: Set up Python
90114
uses: actions/setup-python@v5
@@ -115,7 +139,6 @@ jobs:
115139
steps:
116140
- name: Checkout code
117141
uses: actions/checkout@v5
118-
uses: actions/checkout@v5
119142

120143
- name: Set up Python
121144
uses: actions/setup-python@v5
@@ -146,7 +169,6 @@ jobs:
146169
steps:
147170
- name: Checkout code
148171
uses: actions/checkout@v5
149-
uses: actions/checkout@v5
150172

151173
- name: Set up Python
152174
uses: actions/setup-python@v5
@@ -177,7 +199,6 @@ jobs:
177199
steps:
178200
- name: Checkout code
179201
uses: actions/checkout@v5
180-
uses: actions/checkout@v5
181202

182203
- name: Set up Python
183204
uses: actions/setup-python@v5
@@ -209,7 +230,6 @@ jobs:
209230
steps:
210231
- name: Checkout code
211232
uses: actions/checkout@v5
212-
uses: actions/checkout@v5
213233

214234
- name: Set up Python
215235
uses: actions/setup-python@v5
@@ -242,7 +262,6 @@ jobs:
242262
steps:
243263
- name: Checkout code
244264
uses: actions/checkout@v5
245-
uses: actions/checkout@v5
246265

247266
- name: Set up Python
248267
uses: actions/setup-python@v5
@@ -274,7 +293,6 @@ jobs:
274293
steps:
275294
- name: Checkout code
276295
uses: actions/checkout@v5
277-
uses: actions/checkout@v5
278296

279297
- name: Set up Python
280298
uses: actions/setup-python@v5
@@ -306,7 +324,6 @@ jobs:
306324
steps:
307325
- name: Checkout code
308326
uses: actions/checkout@v5
309-
uses: actions/checkout@v5
310327

311328
- name: Set up Python
312329
uses: actions/setup-python@v5
@@ -338,7 +355,6 @@ jobs:
338355
steps:
339356
- name: Checkout code
340357
uses: actions/checkout@v5
341-
uses: actions/checkout@v5
342358

343359
- name: Set up Python
344360
uses: actions/setup-python@v5
@@ -370,7 +386,6 @@ jobs:
370386
steps:
371387
- name: Checkout code
372388
uses: actions/checkout@v5
373-
uses: actions/checkout@v5
374389

375390
- name: Set up Python
376391
uses: actions/setup-python@v5
@@ -408,7 +423,7 @@ jobs:
408423
- name: Upload coverage to Codecov
409424
uses: codecov/codecov-action@v5
410425
with:
411-
file: coverage-unit.xml
426+
files: coverage-unit.xml
412427
flags: unit
413428
name: unit-tests
414429

@@ -420,7 +435,6 @@ jobs:
420435
steps:
421436
- name: Checkout code
422437
uses: actions/checkout@v5
423-
uses: actions/checkout@v5
424438

425439
- name: Set up Python
426440
uses: actions/setup-python@v5
@@ -458,7 +472,7 @@ jobs:
458472
- name: Upload coverage to Codecov
459473
uses: codecov/codecov-action@v5
460474
with:
461-
file: coverage-integration.xml
475+
files: coverage-integration.xml
462476
flags: integration
463477
name: integration-tests
464478

@@ -470,7 +484,6 @@ jobs:
470484
steps:
471485
- name: Checkout code
472486
uses: actions/checkout@v5
473-
uses: actions/checkout@v5
474487

475488
- name: Set up Python
476489
uses: actions/setup-python@v5
@@ -512,7 +525,6 @@ jobs:
512525
steps:
513526
- name: Checkout code
514527
uses: actions/checkout@v5
515-
uses: actions/checkout@v5
516528

517529
- name: Set up Python
518530
uses: actions/setup-python@v5
@@ -553,7 +565,6 @@ jobs:
553565
steps:
554566
- name: Checkout code
555567
uses: actions/checkout@v5
556-
uses: actions/checkout@v5
557568

558569
- name: Set up Python
559570
uses: actions/setup-python@v5
@@ -596,7 +607,6 @@ jobs:
596607
steps:
597608
- name: Checkout code
598609
uses: actions/checkout@v5
599-
uses: actions/checkout@v5
600610

601611
- name: Set up Python
602612
uses: actions/setup-python@v5
@@ -641,7 +651,7 @@ jobs:
641651
uses: codecov/codecov-action@v5
642652
if: always()
643653
with:
644-
file: coverage-combined.xml
654+
files: coverage-combined.xml
645655
flags: complete
646656
name: complete-tests
647657

.github/workflows/container.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
steps:
4343
- name: Checkout code
4444
uses: actions/checkout@v5
45-
uses: actions/checkout@v5
4645

4746
- name: Install yq
4847
uses: mikefarah/yq@master
@@ -110,7 +109,6 @@ jobs:
110109

111110
steps:
112111
- name: Checkout code
113-
uses: actions/checkout@v5
114112
uses: actions/checkout@v5
115113
with:
116114
fetch-depth: 0

.github/workflows/dependabot.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
steps:
1818
- name: Checkout code
1919
uses: actions/checkout@v5
20-
uses: actions/checkout@v5
2120

2221
- name: Install yq
2322
uses: mikefarah/yq@master

awscpinst/config/user_data.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
set -e
55

66
# Configure logging
7-
exec 1> >(logger -s -t $(basename $0)) 2>&1
7+
exec 1> >(logger -s -t "$(basename "$0")") 2>&1
88

99
echo "[INFO] Starting instance configuration..."
1010

@@ -110,9 +110,8 @@ systemctl start amazon-cloudwatch-agent
110110
echo "[INFO] Configuring instance..."
111111

112112
# Set hostname
113-
INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id)
114113
PRIVATE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
115-
hostnamectl set-hostname ${PRIVATE_IP}
114+
hostnamectl set-hostname "${PRIVATE_IP}"
116115

117116
# Configure system limits
118117
echo "[INFO] Configuring system limits..."

dev-tools/scripts/container_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ build_image() {
102102
log_info "Building Docker image..."
103103

104104
# Build wheel first if it doesn't exist
105-
if [[ ! -f "dist/"*.whl ]]; then
105+
if ! ls dist/*.whl 1> /dev/null 2>&1; then
106106
log_info "Building wheel package..."
107107
make build || {
108108
log_error "Failed to build wheel package"

tests/test-docker.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,7 @@ test_container_startup() {
137137

138138
# Test version command
139139
local version_output
140-
version_output=$(docker run --rm "${TEST_IMAGE_NAME}" version 2>&1)
141-
142-
if [[ $? -ne 0 ]]; then
140+
if ! version_output=$(docker run --rm "${TEST_IMAGE_NAME}" version 2>&1); then
143141
log_error "Container version command failed"
144142
log_error "Output: ${version_output}"
145143
return 1

0 commit comments

Comments
 (0)