Skip to content
This repository has been archived by the owner on Feb 28, 2024. It is now read-only.

Commit

Permalink
Merge branch 'template' into live
Browse files Browse the repository at this point in the history
* template:
  chore: Bump to Fedora 39 (blue-build#186)
  build(deps): bump ASzc/change-string-case-action from 5 to 6 (blue-build#178)
  docs (README): run 'rpm-ostree rebase' without sudo (blue-build#183)
  chore: update bling list (blue-build#181)
  • Loading branch information
tunix committed Nov 9, 2023
2 parents 7490ae5 + 2b0f8fc commit a903d54
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-iso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ 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:
```
systemctl reboot
```
- 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
```
Expand All @@ -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.
Expand Down
7 changes: 6 additions & 1 deletion config/recipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,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: systemd
system:
Expand Down

0 comments on commit a903d54

Please sign in to comment.