diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 1663a3e..fc409df 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -54,32 +54,43 @@ jobs: rpm: strategy: matrix: - container: [ "fedora:36" ] + container: + - name: "fedora:36" + deps: + gcc-12.2.1-4.fc36.x86_64 + gcc-c++-12.2.1-4.fc36.x86_64 + cmake-3.26.3-1.fc36.x86_64 + openssl1.1-devel-1.1.1q-1.fc36.x86_64 + qt: qt5-qtbase-devel-5.15.3-1.fc36.x86_64 + + - name: "fedora:38" + deps: + gcc-13.2.1-1.fc38.x86_64 + gcc-c++-13.2.1-1.fc38.x86_64 + cmake-3.26.2-1.fc38.x86_64 + openssl-devel-1:3.0.9-2.fc38.x86_64 + qt: qt5-qtbase-devel-5.15.10-1.fc38.x86_64 component: [ cli, gui ] include: - component: cli build-opts: --cli --no-gui -t Release --pkg-type rpm - component: gui build-opts: --no-cli --gui -t Release --pkg-type rpm - name: RPM ${{matrix.container}} (${{matrix.component}}) + name: RPM ${{matrix.container.name}} (${{matrix.component}}) runs-on: ubuntu-latest - container: ${{ matrix.container}} + container: ${{ matrix.container.name }} steps: - uses: actions/checkout@v3 - name: Dependancies run: | - sudo dnf install -y util-linux rpmdevtools git \ - gcc-12.2.1-4.fc36.x86_64 \ - gcc-c++-12.2.1-4.fc36.x86_64 \ - cmake-3.26.3-1.fc36.x86_64 \ - openssl1.1-devel-1.1.1q-1.fc36.x86_64 + sudo dnf install -y util-linux rpmdevtools git ${{ matrix.container.deps }} - name: Qt if: startsWith(matrix.component, 'gui') shell: bash run: | - sudo dnf install -y qt5-qtbase-devel-5.15.3-1.fc36.x86_64 + sudo dnf install -y ${{ matrix.container.qt }} - name: Package id: package