Skip to content

Commit 878b881

Browse files
committed
Use dev.sh wrapper in CI workflows and remove manual dependency installation
Simplifies CI workflows by delegating build environment setup to dev.sh, which handles dependencies through Docker containerization.
1 parent 4922ccd commit 878b881

2 files changed

Lines changed: 8 additions & 22 deletions

File tree

.github/workflows/pre_release.yaml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,23 @@ jobs:
3030
path: tmp/kernel/
3131
key: kernels-${{ runner.os }}-${{ runner.arch }}-${{ env.KERNEL_SHA }}
3232

33-
- name: Install build dependencies
34-
run: |
35-
sudo apt-get update -y &&
36-
sudo apt-get install -y build-essential cmake \
37-
gcc-aarch64-linux-gnu pkg-config squashfs-tools git-core \
38-
bc libssl-dev dos2unix
39-
4033
- name: Set GIT_VERSION
4134
shell: bash
4235
run: |
4336
nextVer=$(./scripts/next_version.sh paxx12)
4437
echo "GIT_VERSION=${nextVer//v/}" | tee -a $GITHUB_ENV
4538
4639
- name: Download firmware
47-
run: make firmware
40+
run: ./dev.sh make firmware
4841

4942
- name: Build with Basic firmware
50-
run: sudo GIT_VERSION=${{ env.GIT_VERSION }} make build PROFILE=basic OUTPUT_FILE=U1_basic_${{ env.GIT_VERSION }}_upgrade.bin
43+
run: ./dev.sh make build PROFILE=basic OUTPUT_FILE=U1_basic_${{ env.GIT_VERSION }}_upgrade.bin
5144

5245
- name: Build with Extended firmware
53-
run: sudo GIT_VERSION=${{ env.GIT_VERSION }} make build PROFILE=extended OUTPUT_FILE=U1_extended_${{ env.GIT_VERSION }}_upgrade.bin
46+
run: ./dev.sh make build PROFILE=extended OUTPUT_FILE=U1_extended_${{ env.GIT_VERSION }}_upgrade.bin
5447

5548
- name: Clear Kernel Git Repo
56-
run: sudo git -C tmp/kernel/ clean -fdx
49+
run: ./dev.sh git -C tmp/kernel/ clean -fdx
5750

5851
- name: Generate Changelog
5952
run: make changelog >> RELEASE.md

.github/workflows/pull_request.yaml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,30 +38,23 @@ jobs:
3838
path: tmp/kernel/
3939
key: kernels-${{ runner.os }}-${{ runner.arch }}-${{ env.KERNEL_SHA }}
4040

41-
- name: Install build dependencies
42-
run: |
43-
sudo apt-get update -y &&
44-
sudo apt-get install -y build-essential cmake \
45-
gcc-aarch64-linux-gnu pkg-config squashfs-tools git-core \
46-
bc libssl-dev dos2unix
47-
4841
- name: Set GIT_VERSION
4942
shell: bash
5043
run: |
5144
nextVer=$(./scripts/next_version.sh paxx12 test-pr-${{ github.event.pull_request.number }})
5245
echo "GIT_VERSION=${nextVer//v/}" | tee -a $GITHUB_ENV
5346
5447
- name: Download firmware
55-
run: make firmware
48+
run: ./dev.sh make firmware
5649

5750
- name: Build with Basic firmware
58-
run: sudo GIT_VERSION=${{ env.GIT_VERSION }} make build PROFILE=basic OUTPUT_FILE=U1_basic_${{ env.GIT_VERSION }}_upgrade.bin
51+
run: ./dev.sh make build PROFILE=basic OUTPUT_FILE=U1_basic_${{ env.GIT_VERSION }}_upgrade.bin
5952

6053
- name: Build with Extended firmware
61-
run: sudo GIT_VERSION=${{ env.GIT_VERSION }} make build PROFILE=extended OUTPUT_FILE=U1_extended_${{ env.GIT_VERSION }}_upgrade.bin
54+
run: ./dev.sh make build PROFILE=extended OUTPUT_FILE=U1_extended_${{ env.GIT_VERSION }}_upgrade.bin
6255

6356
- name: Clear Kernel Git Repo
64-
run: sudo git -C tmp/kernel/ clean -fdx
57+
run: ./dev.sh git -C tmp/kernel/ clean -fdx
6558

6659
- uses: actions/upload-artifact@v4
6760
with:

0 commit comments

Comments
 (0)