Skip to content

Commit

Permalink
Merge branch 'main' into bash-prexec
Browse files Browse the repository at this point in the history
  • Loading branch information
castrojo authored Dec 23, 2024
2 parents 1369820 + 2869884 commit b722e89
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/reusable-build-iso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
- name: Upload ISOs and Checksum to Job Artifacts
if: github.ref_name == 'testing'
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
with:
name: ${{ env.ISO_NAME }}
path: ${{ steps.upload-directory.outputs.iso-upload-dir }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ jobs:

- name: Upload artifact
if: github.event_name != 'pull_request'
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
with:
name: image-${{ env.IMAGE_NAME }}-${{ matrix.stream_name }}
retention-days: 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-image-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
echo "name=$(echo ${IMAGE} | awk -F'/' '{print $NF}' | sed 's/:/-/g')" >> $GITHUB_OUTPUT
- name: Upload scan results
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
with:
name: security-${{ steps.artifact-name.outputs.name }}
if-no-files-found: error
Expand Down
8 changes: 6 additions & 2 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,9 @@ rechunk image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0":
# Load into Rootful Podman
ID=$(just sudoif podman images --filter reference=localhost/"${image_name}":"${tag}" --format "'{{ '{{.ID}}' }}'")
if [[ -z "$ID" ]]; then
just sudoif podman image scp ${UID}@localhost::localhost/"${image_name}":"${tag}" root@localhost::localhost/"${image_name}":"${tag}"
COPYTMP=$(mktemp -p "${PWD}" -d -t podman_scp.XXXXXXXXXX)
just sudoif TMPDIR=${COPYTMP} podman image scp ${UID}@localhost::localhost/"${image_name}":"${tag}" root@localhost::localhost/"${image_name}":"${tag}"
rm -rf "${COPYTMP}"
fi

# Prep Container
Expand Down Expand Up @@ -476,7 +478,9 @@ build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0":

# Load Image into rootful podman
if [[ "${UID}" -gt 0 && {{ ghcr }} == "0" ]]; then
just sudoif podman image scp "${UID}"@localhost::"${IMAGE_FULL}" root@localhost::"${IMAGE_FULL}"
COPYTMP=$(mktemp -p "${PWD}" -d -t podman_scp.XXXXXXXXXX)
just sudoif TMPDIR=${COPYTMP} podman image scp "${UID}"@localhost::"${IMAGE_FULL}" root@localhost::"${IMAGE_FULL}"
rm -rf "${COPYTMP}"
fi

FLATPAK_DIR_SHORTNAME="bluefin_flatpaks"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

> "Evolution is a process of constant branching and expansion." - Stephen Jay Gould
For end users it provides a system as reliable as a Chromebook with near-zero maintainance. For developers, a powerful cloud native developer workflow. Check [Introduction to Bluefin](https://universal-blue.discourse.group/t/introduction-to-bluefin/41) for a feature walkthrough.
For end users it provides a system as reliable as a Chromebook with near-zero maintainance. For developers, a powerful cloud native developer workflow. Check [Introduction to Bluefin](https://docs.projectbluefin.io/introduction/) for a feature walkthrough.

- [Download Bluefin](https://projectbluefin.io/#scene-picker)

Expand Down
31 changes: 29 additions & 2 deletions build_files/base/01-build-fix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,36 @@ for repo in "${repos[@]}"; do
fi
done

rpm-ostree override replace \
--experimental \
--from repo=updates \
glib2 \
|| true

rpm-ostree override replace \
--experimental \
--from repo=updates \
glibc \
glibc-common \
glibc-all-langpacks \
glibc-gconv-extra \
|| true

rpm-ostree override replace \
--experimental \
--from repo=updates \
libX11 \
libX11-common \
libX11-xcb \
|| true

rpm-ostree override replace \
--experimental \
--from repo=updates \
elfutils-libelf \
elfutils-libs ||
true
elfutils-libs \
|| true

rpm-ostree override remove \
glibc32 \
|| true
2 changes: 0 additions & 2 deletions packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"fish",
"firewall-config",
"foo2zjs",
"freeipa-client",
"fuse-encfs",
"gcc",
"git-credential-libsecret",
Expand Down Expand Up @@ -50,7 +49,6 @@
"setools-console",
"solaar",
"sssd-ad",
"sssd-ipa",
"sssd-krb5",
"sssd-nfs-idmap",
"stress-ng",
Expand Down
2 changes: 1 addition & 1 deletion system_files/shared/usr/libexec/ublue-bling-fastfetch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

THEME=$(gsettings get org.gnome.desktop.interface accent-color || echo "'slate'")
THEME=$(gsettings get org.gnome.desktop.interface accent-color 2>/dev/null || echo "'slate'")
THEME=${THEME//\'/}

FASTFETCH_COLOR_SET="38;2;53;132;228"
Expand Down
2 changes: 1 addition & 1 deletion system_files/shared/usr/libexec/ublue-motd
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ KEY_WARN_FILE="/run/user-motd-sbkey-warn.md"
[ -e $KEY_WARN_FILE ] && KEY_WARN="**WARNING**: $(cat $KEY_WARN_FILE)"
KEY_WARN_ESCAPED=$(escape "$KEY_WARN")

THEME=$(gsettings get org.gnome.desktop.interface accent-color || echo "'slate'")
THEME=$(gsettings get org.gnome.desktop.interface accent-color 2>/dev/null || echo "'slate'")
THEME=${THEME//\'/}
THEME=${MOTD_FORCE_THEME:-$THEME}

Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ customize-alphas=true
max-alpha=0.8
min-alpha=0.5
running-indicator-style='DOTS'
apply-custom-theme=true

[org.gnome.settings-daemon.plugins.power]
power-button-action='interactive'
Expand Down

0 comments on commit b722e89

Please sign in to comment.