Merge branch 'main' into testing

This commit is contained in:
Kyle Gospodnetich 2024-02-24 20:25:36 -08:00
commit d8fcfd7266
2 changed files with 10 additions and 3 deletions

View File

@ -27,9 +27,15 @@ jobs:
major_version: [39]
image_tag: [stable]
steps:
- name: Set EXTRA_BOOT_ARGS
run: |
EXTRA_BOOT_ARGS=""
if [[ "${{ matrix.image_name }}" == "bazzite=deck" || "${{ matrix.image_name }}" == "bazzite-deck-gnome" ]]; then
EXTRA_BOOT_ARGS="inst.resolution=1280x800"
fi
- name: Build ISOs
#if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
uses: ublue-os/isogenerator@1.0.5
uses: ublue-os/isogenerator@1.0.6
with:
ARCH: x86_64
IMAGE_NAME: ${{ matrix.image_name }}
@ -38,7 +44,8 @@ jobs:
VERSION: ${{ matrix.major_version }}
IMAGE_TAG: ${{ matrix.image_tag }}
ACTION_REPO: ublue-os/isogenerator
ACTION_REF: 1.0.5
ACTION_REF: 1.0.6
EXTRA_BOOT_ARGS: ${{ env.EXTRA_BOOT_ARGS }}
- name: Upload ISOs and SHA Checksum Files to R2
shell: bash
run: |

View File

@ -61,7 +61,7 @@
Name: mesa
Summary: Mesa graphics libraries
%global ver 23.3.5
%global ver 23.3.6
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 100.bazzite.{{{ git_dir_version }}}
License: MIT AND BSD-3-Clause AND SGI-B-2.0