From 26491cc6b72608d0ee3a425c45a1a5f1a7155c18 Mon Sep 17 00:00:00 2001 From: plata Date: Wed, 1 Nov 2023 13:24:30 +0100 Subject: [PATCH 1/4] chore: update bling list (#181) * chore: update bling list * Review comments --- config/recipe.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/recipe.yml b/config/recipe.yml index 7daeb74ac6..3fd222042a 100644 --- a/config/recipe.yml +++ b/config/recipe.yml @@ -32,13 +32,18 @@ modules: - type: bling # configure what to pull in from ublue-os/bling install: - - justfiles # add "!include /usr/share/ublue-os/just/bling.just" + - justfiles # add "!include /usr/share/ublue-os/just/100-bling.just" # in your custom.just (added by default) or local justfile - nix-installer # shell shortcuts for determinate system's nix installers - ublue-os-wallpapers # - ublue-update # https://github.com/ublue-os/ublue-update + # - 1password # install 1Password (stable) and `op` CLI tool # - dconf-update-service # a service unit that updates the dconf db on boot # - devpod # https://devpod.sh/ as an rpm + # - gnome-vrr # enables gnome-vrr for your image + # - container-tools # installs container-related tools onto /usr/bin: kind, kubectx, docker-compose and kubens + # - laptop # installs TLP and configures your system for laptop usage + # - flatpaksync # allows synchronization of user-installed flatpaks, see separate documentation section - type: yafti # if included, yafti and it's dependencies (pip & libadwaita) From 0adc287b5536ac608389967a4c270174ec23b7a1 Mon Sep 17 00:00:00 2001 From: plata Date: Thu, 2 Nov 2023 11:16:01 +0100 Subject: [PATCH 2/4] docs (README): run 'rpm-ostree rebase' without sudo (#183) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b7b6f95ca9..2feeef9085 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ To rebase an existing Silverblue/Kinoite installation to the latest build: - First rebase to the unsigned image, to get the proper signing keys and policies installed: ``` - sudo rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/startingpoint:latest + rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/startingpoint:latest ``` - Reboot to complete the rebase: ``` @@ -54,7 +54,7 @@ To rebase an existing Silverblue/Kinoite installation to the latest build: ``` - Then rebase to the signed image, like so: ``` - sudo rpm-ostree rebase ostree-image-signed:docker://ghcr.io/ublue-os/startingpoint:latest + rpm-ostree rebase ostree-image-signed:docker://ghcr.io/ublue-os/startingpoint:latest ``` - Reboot again to complete the installation ``` @@ -64,7 +64,7 @@ To rebase an existing Silverblue/Kinoite installation to the latest build: This repository builds date tags as well, so if you want to rebase to a particular day's build: ``` -sudo rpm-ostree rebase ostree-image-signed:docker://ghcr.io/ublue-os/startingpoint:20230403 +rpm-ostree rebase ostree-image-signed:docker://ghcr.io/ublue-os/startingpoint:20230403 ``` This repository by default also supports signing. From 0645f7ca23b83700b18b868f0df26bf3a6b32fb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Nov 2023 11:17:01 +0000 Subject: [PATCH 3/4] build(deps): bump ASzc/change-string-case-action from 5 to 6 (#178) Bumps [ASzc/change-string-case-action](https://github.com/aszc/change-string-case-action) from 5 to 6. - [Release notes](https://github.com/aszc/change-string-case-action/releases) - [Commits](https://github.com/aszc/change-string-case-action/compare/v5...v6) --- updated-dependencies: - dependency-name: ASzc/change-string-case-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01a1b469c7..4827dbf03a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -126,13 +126,13 @@ jobs: # https://github.com/macbre/push-to-ghcr/issues/12 - name: Lowercase Registry id: registry_case - uses: ASzc/change-string-case-action@v5 + uses: ASzc/change-string-case-action@v6 with: string: ${{ env.IMAGE_REGISTRY }} - name: Lowercase Image id: image_case - uses: ASzc/change-string-case-action@v5 + uses: ASzc/change-string-case-action@v6 with: string: ${{ env.IMAGE_NAME }} From 2b0f8fc7eb9371f732e5c4656dbce35a1add73d1 Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Wed, 8 Nov 2023 17:22:25 +0100 Subject: [PATCH 4/4] chore: Bump to Fedora 39 (#186) * Bump release-iso workflow to Fedora 39 * Pin isogenerator version It is recommended in order to avoid some unexpected changes to the maintainer. * Update other recipe & containerfile to reflect Fedora 39 change --- .github/workflows/release-iso.yml | 6 +++--- Containerfile | 2 +- config/recipe.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 719e8b35aa..76682bec54 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -13,17 +13,17 @@ jobs: permissions: contents: write container: - image: fedora:38 + image: fedora:39 options: --privileged steps: - uses: actions/checkout@v4 - name: Generate ISO - uses: ublue-os/isogenerator@main + uses: ublue-os/isogenerator@v2.2.0 id: isogenerator with: image-name: ${{ github.event.repository.name }} installer-repo: releases - installer-major-version: 38 + installer-major-version: 39 boot-menu-path: boot_menu.yml - name: install github CLI run: | diff --git a/Containerfile b/Containerfile index 084869aa1e..735aa5d1e1 100644 --- a/Containerfile +++ b/Containerfile @@ -9,7 +9,7 @@ # does nothing if the image is built in the cloud. # !! Warning: changing these might not do anything for you. Read comment above. -ARG IMAGE_MAJOR_VERSION=38 +ARG IMAGE_MAJOR_VERSION=39 ARG BASE_IMAGE_URL=ghcr.io/ublue-os/silverblue-main FROM ${BASE_IMAGE_URL}:${IMAGE_MAJOR_VERSION} diff --git a/config/recipe.yml b/config/recipe.yml index 3fd222042a..905c262077 100644 --- a/config/recipe.yml +++ b/config/recipe.yml @@ -5,7 +5,7 @@ description: A starting point for further customization of uBlue images. Make yo # the base image to build on top of (FROM) and the version tag to use base-image: ghcr.io/ublue-os/silverblue-main -image-version: 38 # latest is also supported if you want new updates ASAP +image-version: 39 # latest is also supported if you want new updates ASAP # module configuration, executed in order # you can include multiple instances of the same module