diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 4f4c43329ba..7134559b0a3 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -128,8 +128,8 @@ jobs: SHA_SHORT="${GITHUB_SHA::7}" COMMIT_TAGS+=("pr-${{ github.event.number }}-${FEDORA_VERSION}") COMMIT_TAGS+=("${SHA_SHORT}-${FEDORA_VERSION}") - if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ - [[ "${{ matrix.is_stable_version }}" == "true" ]]; then + if [[ "$IS_LATEST_VERSION" == "true" ]] && \ + [[ "$IS_STABLE_VERSION" == "true" ]]; then COMMIT_TAGS+=("pr-${{ github.event.number }}") COMMIT_TAGS+=("${SHA_SHORT}") fi @@ -138,16 +138,16 @@ jobs: if [[ ${{ github.ref_name }} == "testing" ]]; then BUILD_TAGS=("${FEDORA_VERSION}-testing" "${FEDORA_VERSION}-testing-${TIMESTAMP}") - if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ - [[ "${{ matrix.is_stable_version }}" == "true" ]]; then + if [[ "$IS_LATEST_VERSION" == "true" ]] && \ + [[ "$IS_STABLE_VERSION" == "true" ]]; then BUILD_TAGS+=("testing") - elif [[ "${{ matrix.is_gts_version }}" == "true" ]]; then + elif [[ "$IS_GTS_VERSION" == "true" ]]; then BUILD_TAGS+=("gts-testing") fi - elif [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ - [[ "${{ matrix.is_stable_version }}" == "true" ]]; then + elif [[ "$IS_LATEST_VERSION" == "true" ]] && \ + [[ "$IS_STABLE_VERSION" == "true" ]]; then BUILD_TAGS+=("latest") - elif [[ "${{ matrix.is_gts_version }}" == "true" ]]; then + elif [[ "$IS_GTS_VERSION" == "true" ]]; then BUILD_TAGS+=("gts") fi diff --git a/build_files/base/install-akmods.sh b/build_files/base/install-akmods.sh index 26eac0433f5..43a68596405 100755 --- a/build_files/base/install-akmods.sh +++ b/build_files/base/install-akmods.sh @@ -10,7 +10,12 @@ if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then /tmp/akmods-rpms/kmods/*xone*.rpm \ /tmp/akmods-rpms/kmods/*openrazer*.rpm \ /tmp/akmods-rpms/kmods/*wl*.rpm - if grep -Eqv "(surface|asus)" <<< "${AKMODS_FLAVOR}"; then + # Temporarily disable v4l2loopback until RPMFusion rebuilds module. + # if grep -Eqv "(surface|asus)" <<< "${AKMODS_FLAVOR}"; then + # rpm-ostree install \ + # /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm + # fi + if [[ "${FEDORA_MAJOR_VERSION}" == "40" ]] && grep -Eqv "(surface|asus)" <<< "${AKMODS_FLAVOR}"; then rpm-ostree install \ /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm fi