From edf2df43b1bc677a8ad0d57fc53653a388fd1512 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Wed, 7 Feb 2024 16:41:44 -0600 Subject: [PATCH] Add flatpak-devel, fix build space in ci runner... remove arm build job temporarily, fix build job not pushing --- .github/workflows/build.yml | 31 +++++++++++++------------------ Containerfile | 15 ++++----------- desc.yml | 4 +++- 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed2b03e..e58d732 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,15 +24,18 @@ jobs: strategy: fail-fast: false matrix: - arch: [amd64, arm64] + arch: [amd64] #add ,arm64 to add back arm build steps: - name: Maximize build space - uses: AdityaGarg8/remove-unwanted-software@v1 + uses: easimon/maximize-build-space@v10 with: + root-reserve-mb: 37500 remove-dotnet: 'true' remove-android: 'true' remove-haskell: 'true' + remove-codeql: 'true' + remove-docker-images: 'true' # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action @@ -141,32 +144,24 @@ jobs: labels: ${{ steps.meta.outputs.labels }} oci: false + - name: 'Login to GitHub Container Registry' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{github.actor}} + password: ${{secrets.GITHUB_TOKEN}} + # Push the image to GHCR (Image Registry) - name: Push To GHCR uses: redhat-actions/push-to-registry@v2 id: push - if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live' - env: - REGISTRY_USER: ${{ github.actor }} - REGISTRY_PASSWORD: ${{ github.token }} with: image: ${{ steps.build_image.outputs.image }} tags: ${{ steps.build_image.outputs.tags }} registry: ${{ steps.registry_case.outputs.lowercase }} - username: ${{ env.REGISTRY_USER }} - password: ${{ env.REGISTRY_PASSWORD }} extra-args: | --disable-content-trust - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live' - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Echo outputs - if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live' run: | - echo "${{ toJSON(steps.push.outputs) }}" + echo "${{ toJSON(steps.push.outputs) }}" \ No newline at end of file diff --git a/Containerfile b/Containerfile index 02a4d2d..61d44a3 100644 --- a/Containerfile +++ b/Containerfile @@ -1,5 +1,5 @@ ARG IMAGE_MAJOR_VERSION=39 -ARG BASE_IMAGE_URL=quay.io/fedora/fedora-silverblue +ARG BASE_IMAGE_URL=quay.io/fedora-ostree-desktops/base FROM registry.fedoraproject.org/fedora:${IMAGE_MAJOR_VERSION} AS cosmic-builder @@ -22,7 +22,8 @@ RUN dnf install -y git \ cargo \ mesa-libgbm-devel \ pipewire-devel \ - pam-devel + pam-devel \ + flatpak-devel RUN git clone --recurse-submodules https://github.com/pop-os/cosmic-epoch RUN cd cosmic-epoch && just sysext && rm -rf cosmic-sysext/usr/lib/extension-release.d @@ -47,15 +48,7 @@ RUN git clone --recurse-submodules https://github.com/pop-os/system76-wallpapers FROM ${BASE_IMAGE_URL}:${IMAGE_MAJOR_VERSION} -ARG IMAGE_REGISTRY=ghcr.io/drakulix -RUN rpm-ostree uninstall gnome-control-center gnome-control-center-filesystem gnome-shell mutter gdm gnome-shell-extension-common gnome-session gnome-session-xsession gnome-classic-session gnome-session-wayland-session gnome-initial-setup gnome-shell-extension-background-logo gnome-shell-extension-window-list gnome-shell-extension-places-menu gnome-browser-connector gnome-shell-extension-launch-new-instance gnome-shell-extension-apps-menu xdg-desktop-portal-gnome yelp xorg-x11-xinit ibus ibus-anthy ibus-hangul ibus-anthy-python ibus-libpinyin ibus-libzhuyin ibus-m17n ibus-setup ibus-typing-booster -# aarch specific -RUN if [ `uname -m` == "aarch64" ]; then rpm-ostree uninstall xorg-x11-server-Xorg xorg-x11-drv-nouveau xorg-x11-drv-wacom xorg-x11-drv-qxl xorg-x11-drv-libinput xorg-x11-drv-amdgpu xorg-x11-drv-fbdev xorg-x11-drv-evdev xorg-x11-drv-ati xorg-x11-drv-armsoc; fi -RUN if [ `uname -m` == "x86_64" ]; then rpm-ostree uninstall xorg-x11-server-Xorg xorg-x11-drv-nouveau xorg-x11-drv-wacom xorg-x11-drv-qxl xorg-x11-drv-libinput xorg-x11-drv-amdgpu xorg-x11-drv-fbdev xorg-x11-drv-evdev xorg-x11-drv-ati xorg-x11-drv-intel xorg-x11-drv-openchrome xorg-x11-drv-vesa xorg-x11-drv-vmware; fi - -# Silverblue packages, we want as well, once we can swap to a proper base image -# RUN rpm-ostree install ModemManager NetworkManager-adsl NetworkManager-openconnect-gnome NetworkManager-openvpn-gnome NetworkManager-ppp NetworkManager-wwan adobe-source-code-pro-fonts at-spi2-atk at-spi2-core avahi dconf fprintd-pam glx-utils gnome-software gvfs-afc gvfs-afp gvfs-archive gvfs-fuse gvfs-goa gvfs-gphoto2 gvfs-mtp gvfs-smb librsvg2 libsane-hpaio mesa-dri-drivers mesa-libEGL mesa-vulkan-drivers nautilus orca plymouth-system-theme polkit rygel systemd-oomd-defaults tracker tracker-miners xdg-user-dirs-gtk # Cosmic dependencies RUN rpm-ostree install \ @@ -97,7 +90,7 @@ RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/web/web COPY --from=wallpapers-builder /system76-wallpapers/backgrounds /usr/share/backgrounds/pop -RUN rm /etc/systemd/system/display-manager.service && ln -s /usr/lib/systemd/system/cosmic-greeter.service /etc/systemd/system/display-manager.service +RUN ln -s /usr/lib/systemd/system/cosmic-greeter.service /etc/systemd/system/display-manager.service RUN rm -rf /var/lib/greetd RUN rpm-ostree cleanup -m && ostree container commit diff --git a/desc.yml b/desc.yml index 60d7bb6..1590fb0 100644 --- a/desc.yml +++ b/desc.yml @@ -1,3 +1,5 @@ -name: infinity +title: Fedora COSMIC Atomic +name: fedora-cosmic-atomic description: Fedora based ostree image with the COSMIC desktop environment +image-registry: ghcr.io image-version: 39 \ No newline at end of file