cd: switch RPM build back to job container with pre-checkout git install

Install git in the Fedora container before actions/checkout so the checkout step can clone the repository normally instead of falling back to the REST API.
This commit is contained in:
2026-07-13 14:54:35 +08:00
parent c786469a58
commit 8fa32f5df4
+37 -33
View File
@@ -371,45 +371,49 @@ jobs:
# ------------------------------------------------------------------ # ------------------------------------------------------------------
rpm: rpm:
runs-on: warp-ubuntu-latest-x64-16x runs-on: warp-ubuntu-latest-x64-16x
container:
image: fedora:latest
steps: steps:
- name: Install Git
run: dnf install -y git
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
submodules: true submodules: true
- name: Build package in Fedora container - name: Install dependencies
run: | run: |
docker run --rm \ dnf install -y \
-v "${PWD}:/build" \ cmake ninja-build pkgconf-pkg-config \
-w /build \ qt6-qtbase-devel qt6-qtbase-private-devel qt6-qttools-devel \
fedora:latest \ ffmpeg-free-devel \
bash -c ' OpenImageIO-devel \
set -e OpenColorIO-devel \
dnf install -y \ openexr-devel \
cmake ninja-build pkgconf-pkg-config \ expat-devel \
qt6-qtbase-devel qt6-qtbase-private-devel qt6-qttools-devel \ portaudio-devel \
ffmpeg-free-devel \ mesa-libGL-devel \
OpenImageIO-devel \ vulkan-headers \
OpenColorIO-devel \ vulkan-loader-devel \
openexr-devel \ libxkbcommon-devel \
expat-devel \ gcc-c++ \
portaudio-devel \ bzip2-devel \
mesa-libGL-devel \ rpm-build
vulkan-headers \
vulkan-loader-devel \ - name: Build
libxkbcommon-devel \ run: |
gcc-c++ \ cmake -S . -B build -G Ninja \
bzip2-devel \ -DCMAKE_BUILD_TYPE=Release \
rpm-build -DCMAKE_INSTALL_PREFIX=/usr \
cmake -S . -B build -G Ninja \ -DBUILD_QT6=ON \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_DISABLE_FIND_PACKAGE_Vulkan=ON
-DCMAKE_INSTALL_PREFIX=/usr \ cmake --build build
-DBUILD_QT6=ON \
-DCMAKE_DISABLE_FIND_PACKAGE_Vulkan=ON - name: Create RPM package
cmake --build build run: |
cd build cd build
cpack -G RPM cpack -G RPM
mv *.rpm /build/ mv *.rpm "${GITHUB_WORKSPACE}/"
'
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4