Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/actions/build-push-sign/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,10 @@ runs:
DST: ${{ inputs.registry_path }}/${{ inputs.image_name }}
run: |
set -x
additional_tags=()
for tag in ${{ inputs.tags }} ${{ env.LONG_TAG }} ${{ env.SHORT_TAG }}; do
additional_tags+=(--additional-tag ${DST}:${tag})
skopeo copy --preserve-digests \
docker://${SRC} docker://${DST}:${tag}
done
skopeo copy --preserve-digests \
"${additional_tags[@]}" \
docker://${SRC} docker://${DST}:${{ inputs.target }}-${{ github.sha }}

- name: Sign image (${{ inputs.target }})
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
REGISTRY: ghcr.io
IMAGE_NAME: kinoite
# When updating this value, remember to also update the webhook
UPSTREAM_VERSION: 43
UPSTREAM_VERSION: 44

jobs:
wait-for-new-upstream-image:
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -euo pipefail

UPSTREAM_IMAGE=quay.io/fedora-ostree-desktops/kinoite:43
UPSTREAM_IMAGE=quay.io/fedora-ostree-desktops/kinoite:44
PACKAGES_READ_TOKEN=$(cat ~/.git-credentials | sed 's;.*:\(.*\)@.*;\1;')
TARGET=${1:-surface}

Expand Down
16 changes: 9 additions & 7 deletions setup/steps/4-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,21 @@ pkgs+=(
podman-compose
)

# Intel GPU
# Intel GPU, see https://rpmfusion.org/Howto/Multimedia
if [ "${VARIANT}" == "julia" ] || [ "${VARIANT}" == "surface" ]; then
pkgs+=(
intel-media-driver
)
fi

# AMD GPU, see https://rpmfusion.org/Howto/Multimedia
# mesa-vdpau-drivers-freeworld does not exist after fedora 43
if [ "${VARIANT}" == "opa" ]; then
pkgs+=(
mesa-va-drivers-freeworld
)
fi

# KDE apps that don't work as flatpaks
if [ "${VARIANT}" == "julia" ]; then
pkgs+=(
Expand Down Expand Up @@ -60,9 +68,3 @@ fi
echo "2. Installing packages for Variant \"${VARIANT}\": ${pkgs[*]}"

dnf -y install "${pkgs[@]}"

# AMD GPU
if [ "${VARIANT}" == "opa" ]; then
dnf swap -y mesa-va-drivers mesa-va-drivers-freeworld
dnf swap -y mesa-vdpau-drivers mesa-vdpau-drivers-freeworld
fi
Loading