diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index 0c4e7e4..b1caa4e 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -11,6 +11,7 @@ on: push: paths: - 'base.Dockerfile' + - 'repo/**' env: # Use docker.io for Docker Hub if empty diff --git a/base.Dockerfile b/base.Dockerfile index 0a733ab..66aeef2 100644 --- a/base.Dockerfile +++ b/base.Dockerfile @@ -12,6 +12,8 @@ ARG IMAGE_NAME="${IMAGE_NAME}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" +COPY repo/*.repo /etc/yum.repos.d/ + # install RPM-fusion RUN rpm-ostree install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm @@ -21,9 +23,7 @@ RUN rpm-ostree install glibc.i686 RUN rpm-ostree override remove libavcodec-free libavfilter-free libavformat-free libavutil-free libpostproc-free libswresample-free libswscale-free --install libavcodec-freeworld # Mesa clang -RUN cd /etc/yum.repos.d/ && wget https://copr.fedorainfracloud.org/coprs/trixieua/mesa-clang/repo/fedora-$(rpm -E %fedora)/trixieua-mesa-clang-fedora-$(rpm -E %fedora).repo && rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:trixieua:mesa-clang mesa-filesystem mesa-libglapi mesa-dri-drivers mesa-libgbm mesa-libEGL mesa-libGL mesa-vulkan-drivers mesa-libxatracker mesa-vdpau-drivers mesa-libOSMesa mesa-libOpenCL mesa-va-drivers - -COPY repo/*.repo /etc/yum.repos.d/ +RUN rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:trixieua:mesa-clang mesa-filesystem mesa-libglapi mesa-dri-drivers mesa-libgbm mesa-libEGL mesa-libGL mesa-vulkan-drivers mesa-libxatracker mesa-vdpau-drivers mesa-libOSMesa mesa-libOpenCL mesa-va-drivers # 32-bit dependencies for the Nvidia driver. RUN rpm-ostree override replace --experimental --from repo=mesa-clang-i386 mesa-dri-drivers.i686 diff --git a/repo/fedora-clang.repo b/repo/fedora-clang.repo new file mode 100644 index 0000000..ff051ca --- /dev/null +++ b/repo/fedora-clang.repo @@ -0,0 +1,12 @@ +[fedora-clang] +name=Copr repo for clang-built-f38 owned by @fedora-llvm-team +baseurl=https://download.copr.fedorainfracloud.org/results/@fedora-llvm-team/clang-built-f$releasever/fedora-$releasever-$basearch/ +type=rpm-md +skip_if_unavailable=True +gpgcheck=1 +gpgkey=https://download.copr.fedorainfracloud.org/results/@fedora-llvm-team/clang-built-f$releasever/pubkey.gpg +repo_gpgcheck=0 +enabled=1 +enabled_metadata=1 +cost=10 +priority=10 diff --git a/repo/mesa-clang-x64.repo b/repo/mesa-clang-x64.repo new file mode 100644 index 0000000..6664963 --- /dev/null +++ b/repo/mesa-clang-x64.repo @@ -0,0 +1,13 @@ +[copr:copr.fedorainfracloud.org:trixieua:mesa-clang] +name=Copr repo for mesa-clang owned by trixieua +baseurl=https://download.copr.fedorainfracloud.org/results/trixieua/mesa-clang/fedora-$releasever-$basearch/ +type=rpm-md +skip_if_unavailable=True +gpgcheck=1 +gpgkey=https://download.copr.fedorainfracloud.org/results/trixieua/mesa-clang/pubkey.gpg +repo_gpgcheck=0 +enabled=1 +enabled_metadata=1 +module_hotfixes=1 +cost=9 +priority=9