Skip to content

Commit 40acde0

Browse files
authored
Merge pull request #9 from kernelkit/update-workflow
Update workflows
2 parents 6f54710 + cac03ab commit 40acde0

File tree

2 files changed

+12
-38
lines changed

2 files changed

+12
-38
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ on:
77
branches:
88
- main
99
workflow_dispatch:
10-
inputs:
11-
minimal:
12-
description: 'Build minimal defconfigs'
13-
required: false
14-
default: true
15-
type: boolean
1610

1711
jobs:
1812
build:
@@ -50,21 +44,7 @@ jobs:
5044
"${{ github.event.number }}" "${{ github.event.pull_request.head.sha }}" \
5145
| tee -a $GITHUB_OUTPUT $GITHUB_ENV
5246
fi
53-
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
54-
if [ "${{ github.event.inputs.minimal }}" == "true" ]; then
55-
flavor="_minimal"
56-
fi
57-
else
58-
# Ensure 'release' job get the proper image when building main
59-
if [ "$GITHUB_REF_NAME" != "main" ]; then
60-
flavor="_minimal"
61-
else
62-
flavor=""
63-
fi
64-
if ${{ contains(github.event.pull_request.labels.*.name, 'ci:main') }}; then
65-
flavor=""
66-
fi
67-
fi
47+
6848
target=${{ matrix.target }}
6949
echo "dir=vendor-example-$target" >> $GITHUB_OUTPUT
7050
echo "tgz=vendor-example-$target.tar.gz" >> $GITHUB_OUTPUT
@@ -87,17 +67,17 @@ jobs:
8767
ccache-${{ matrix.target }}-
8868
ccache-
8969
90-
- name: Configure ${{ matrix.target }}${{ steps.vars.outputs.flv }}
70+
- name: Configure ${{ matrix.target }}
9171
run: |
92-
make ${{ matrix.target }}${{ steps.vars.outputs.flv }}_defconfig
72+
make ${{ matrix.target }}_defconfig
9373
9474
- name: Unit Test ${{ matrix.target }}
9575
run: |
9676
make test-unit
9777
98-
- name: Build ${{ matrix.target }}${{ steps.vars.outputs.flv }}
78+
- name: Build ${{ matrix.target }}
9979
run: |
100-
echo "Building ${{ matrix.target }}${{ steps.vars.outputs.flv }}_defconfig ..."
80+
echo "Building ${{ matrix.target }}_defconfig ..."
10181
make
10282
10383
- name: Check SBOM from Build
@@ -149,23 +129,16 @@ jobs:
149129
>>$GITHUB_ENV
150130
fi
151131
152-
if [ "$GITHUB_REF_NAME" != "main" ]; then
153-
flavor="_minimal"
154-
else
155-
flavor=""
156-
fi
157-
echo "flv=$flavor" >> $GITHUB_OUTPUT
158-
159-
- name: Configure x86_64${{ steps.vars.outputs.flv }}
132+
- name: Configure x86_64
160133
run: |
161-
make x86_64${{ steps.vars.outputs.flv }}_defconfig
134+
make x86_64_defconfig
162135
163136
- uses: actions/download-artifact@v4
164137
with:
165138
pattern: "artifact-*"
166139
merge-multiple: true
167140

168-
- name: Restore x86-64${{ steps.vars.outputs.flv }} output/
141+
- name: Restore x86-64 output/
169142
run: |
170143
ls -l
171144
mkdir -p output
@@ -174,16 +147,16 @@ jobs:
174147
tar xf vendor-example-x86_64.tar.gz
175148
ln -s vendor-example-x86_64 images
176149
177-
- name: Regression Test x86_64${{ steps.vars.outputs.flv }}
150+
- name: Regression Test x86_64
178151
run: |
179152
make test
180153
181-
- name: Publish Test Result for x86_64${{ steps.vars.outputs.flv }}
154+
- name: Publish Test Result for x86_64
182155
# Ensure this runs even if Regression Test fails
183156
if: always()
184157
run: cat infix/test/.log/last/result-gh.md >> $GITHUB_STEP_SUMMARY
185158

186-
- name: Generate Test Report for x86_64${{ steps.vars.outputs.flv }}
159+
- name: Generate Test Report for x86_64
187160
# Ensure this runs even if Regression Test fails
188161
if: always()
189162
run: |

.github/workflows/sync-infix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
fi
4242
4343
cd infix
44+
git fetch --recurse-submodules
4445
git clean -ffdx
4546
git checkout main
4647
git clean -ffdx

0 commit comments

Comments
 (0)