Skip to content
Merged
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
31 changes: 3 additions & 28 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,9 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-24.04, ubuntu-24.04-arm ]
major_version: [42, 43]
major_version: [42, 43, 44]
image_name: [silverblue]
image_variant: [main, surface]
exclude:
# no aarch64 variants for surface devices
- os: ubuntu-24.04-arm
image_variant: surface
- image_variant: surface
major_version: 43
image_variant: [main]
env:
IMAGE_NAME: ${{ matrix.image_name }}-${{ matrix.image_variant }}
steps:
Expand All @@ -54,20 +48,7 @@ jobs:
id: version
shell: bash
run: |
if [[ ${{ matrix.image_variant }} =~ surface ]]; then
container_name="fq-$(uuidgen)"
dnf="podman exec $container_name dnf"
curl="podman exec $container_name curl"

podman run --entrypoint /bin/bash --name "$container_name" -dt "quay.io/fedora/fedora:${{ matrix.major_version }}"
$dnf install -y dnf-plugins-core
fi

case ${{ matrix.image_variant }} in
"surface")
$curl -Lo /etc/yum.repos.d/linux-surface.repo https://pkg.surfacelinux.com/fedora/linux-surface.repo
linux=$($dnf repoquery --repoid linux-surface --whatprovides kernel-surface | sort -V | tail -n1 | sed 's/.*://')
;;
"main")
linux=$(skopeo inspect docker://quay.io/fedora/fedora${{ contains(matrix.image_name,'base') && '' || '-'}}${{ matrix.image_name }}:${{ matrix.major_version }} | jq -r '.Labels["ostree.linux"]' )
;;
Expand Down Expand Up @@ -140,7 +121,7 @@ jobs:
${{ env.IMAGE_NAME }}
labels: |
org.opencontainers.image.version=${{ steps.labels.outputs.VERSION }}
org.opencontainers.image.description=abcook-os ${{ matrix.image_name }}${{ contains(matrix.image_variant,'surface') && ' for Surface devices' || ''}}${{ contains(matrix.image_variant,'nvidia') && ' with Nvidia drivers' || ''}}.
org.opencontainers.image.description=abcook-os ${{ matrix.image_name }}.
ostree.linux=${{ steps.version.outputs.KERNEL_VERSION }}
io.artifacthub.package.readme-url=https://raw.githubusercontent.com/${{ github.repository }}/main/README.md
io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/44739883?s=200&v=4
Expand Down Expand Up @@ -248,7 +229,6 @@ jobs:
- silverblue
image_variant:
- main
- surface
major_version:
- 42
- 43
Expand All @@ -260,10 +240,6 @@ jobs:

# image exclusion matrix
image_exclusions_def = """
- image_arch: aarch64
image_variant: surface
- image_variant: surface
major_version: 43
"""
image_exclusions_dict = yaml.safe_load(image_exclusions_def)

Expand All @@ -285,7 +261,6 @@ jobs:
- silverblue
image_variant:
- main
- surface
major_version:
- 42
- 43
Expand Down
17 changes: 0 additions & 17 deletions surface/packages.json

This file was deleted.

9 changes: 0 additions & 9 deletions surface/post-install.sh

This file was deleted.

22 changes: 0 additions & 22 deletions surface/pre-install.sh

This file was deleted.

25 changes: 0 additions & 25 deletions surface/system_files/shared/usr/bin/surface-hardware-setup

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading