Skip to content

Commit 86e23de

Browse files
committed
refactor(ci): Consolidate sed calls
Sort variable names. Signed-off-by: Loïc Minier <[email protected]>
1 parent 2f59985 commit 86e23de

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

.github/workflows/lava-schema-check.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ jobs:
2323
BUILD_DOWNLOAD_URL="https://example.com/downloads/1"
2424
GITHUB_SHA="7e6f96ccf3e911a8a1a18accdbb91991aa0db66e"
2525
26-
find ci/lava/ -name "*.yaml" -exec sed -i "s|{{DEVICE_TYPE}}|${DEVICE_TYPE}|g" '{}' \;
27-
find ci/lava/ -name "*.yaml" -exec sed -i "s|{{GITHUB_SHA}}|${GITHUB_SHA}|g" '{}' \;
28-
find ci/lava/ -name "*.yaml" -exec sed -i "s|{{BUILD_DOWNLOAD_URL}}|${BUILD_DOWNLOAD_URL}|g" '{}' \;
29-
find ci/lava/ -name "*.yaml" -exec sed -i "s|{{BUILD_FILE_NAME}}|${BUILD_FILE_NAME}|g" '{}' \;
30-
find ci/lava/ -name "*.yaml" -exec sed -i "s|{{GITHUB_RUN_ID}}|${GITHUB_RUN_ID}|g" '{}' \;
26+
find ci/lava/ -name "*.yaml" -exec sed \
27+
-e "s|{{BUILD_DOWNLOAD_URL}}|${BUILD_DOWNLOAD_URL}|g" \
28+
-e "s|{{BUILD_FILE_NAME}}|${BUILD_FILE_NAME}|g" \
29+
-e "s|{{DEVICE_TYPE}}|${DEVICE_TYPE}|g" \
30+
-e "s|{{GITHUB_RUN_ID}}|${GITHUB_RUN_ID}|g" \
31+
-e "s|{{GITHUB_SHA}}|${GITHUB_SHA}|g" \
32+
-i '{}' \;
3133
3234
python3 ci/schemacheck.py ./ci/lava/

.github/workflows/lava-test.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,12 @@ jobs:
6767
# left-side – e.g. qrb2210-rb1
6868
DEVICE_TYPE="${TARGET%/*}"
6969
BUILD_DOWNLOAD_URL="$BUILD_URL"
70-
sed -i "s|{{DEVICE_TYPE}}|${DEVICE_TYPE}|g" "$TEMPLATE"
71-
sed -i "s|{{GITHUB_SHA}}|${GITHUB_SHA}|g" "$TEMPLATE"
72-
sed -i "s|{{BUILD_DOWNLOAD_URL}}|${BUILD_DOWNLOAD_URL}|g" "$TEMPLATE"
73-
sed -i "s|{{GITHUB_RUN_ID}}|${GITHUB_RUN_ID}|g" "$TEMPLATE"
70+
sed \
71+
-e "s|{{BUILD_DOWNLOAD_URL}}|${BUILD_DOWNLOAD_URL}|g" \
72+
-e "s|{{DEVICE_TYPE}}|${DEVICE_TYPE}|g" \
73+
-e "s|{{GITHUB_RUN_ID}}|${GITHUB_RUN_ID}|g" \
74+
-e "s|{{GITHUB_SHA}}|${GITHUB_SHA}|g" \
75+
-i "$TEMPLATE"
7476
cat "$TEMPLATE"
7577
7678
- name: Submit ${{ matrix.target }}

0 commit comments

Comments
 (0)