Skip to content

Commit

Permalink
Squash some commits together
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanabx committed Feb 20, 2024
1 parent 35495e0 commit af79d4f
Show file tree
Hide file tree
Showing 11 changed files with 652 additions and 510 deletions.
505 changes: 505 additions & 0 deletions .github/workflows/build_everything.yml

Large diffs are not rendered by default.

161 changes: 0 additions & 161 deletions .github/workflows/build_silverblue.yml

This file was deleted.

161 changes: 0 additions & 161 deletions .github/workflows/build_silverblue_nvidia.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/build.yml → .github/workflows/compile.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: build
name: compile
on:
workflow_dispatch:

Expand Down Expand Up @@ -40,9 +40,9 @@ jobs:

- name: Gather image data from description
run: |
echo "IMAGE_NAME=$(yq '.name' ./containers/fedora-cosmic-atomic/desc.yml)" >> $GITHUB_ENV
echo "IMAGE_DESCRIPTION=$(yq '.description' ./containers/fedora-cosmic-atomic/desc.yml)" >> $GITHUB_ENV
echo "IMAGE_MAJOR_VERSION=$(yq '.image-version' ./containers/fedora-cosmic-atomic/desc.yml)" >> $GITHUB_ENV
echo "IMAGE_NAME=$(yq '.name' ./containers/cosmic-desktop-compiled/desc.yml)" >> $GITHUB_ENV
echo "IMAGE_DESCRIPTION=$(yq '.description' ./containers/cosmic-desktop-compiled/desc.yml)" >> $GITHUB_ENV
echo "IMAGE_MAJOR_VERSION=$(yq '.image-version' ./containers/cosmic-desktop-compiled/desc.yml)" >> $GITHUB_ENV
- name: Get current version
id: labels
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
uses: redhat-actions/buildah-build@v2
with:
containerfiles: |
./containers/fedora-cosmic-atomic/Containerfile
./containers/cosmic-desktop-compiled/Containerfile
image: ${{ env.IMAGE_NAME }}
tags: |
${{ steps.generate-tags.outputs.alias_tags }}
Expand Down
38 changes: 38 additions & 0 deletions containers/cosmic-desktop-compiled/Containerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
FROM registry.fedoraproject.org/fedora:39

RUN dnf update -y
RUN dnf install -y git \
make \
which \
just \
rustc \
libglvnd-devel \
libseat-devel \
libxkbcommon-devel \
lld \
libinput-devel \
glib2-devel \
gtk3-devel \
dbus-devel \
wayland-devel \
clang-devel \
cargo \
mesa-libgbm-devel \
pipewire-devel \
pam-devel \
flatpak-devel \
rust-rav1e+nasm-rs-devel
RUN git clone --recurse-submodules https://github.com/pop-os/cosmic-epoch
# This is where the magic happens
RUN cd cosmic-epoch && git submodule update --remote && just sysext && rm -rf cosmic-sysext/usr/lib/extension-release.d

RUN cd ..

RUN git clone --recurse-submodules https://github.com/pop-os/launcher
RUN cd launcher && just build-release

RUN cd ..

RUN dnf update -y
RUN dnf install -y git
RUN git clone --recurse-submodules https://github.com/pop-os/system76-wallpapers
Loading

0 comments on commit af79d4f

Please sign in to comment.