Skip to content

Commit

Permalink
Merge branch 'template' into 179-intended-that-iso-release-has-multip…
Browse files Browse the repository at this point in the history
…le-isos
  • Loading branch information
xynydev authored Nov 20, 2023
2 parents 37ed6e5 + 6b4e4ab commit f3cf222
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This workflow builds every branch of the repository daily at 20:22 UTC, one hour after ublue-os/nvidia builds.
# This workflow builds every branch of the repository daily at 16:30 UTC, one hour after ublue-os/nvidia builds.
# The images are also built after pushuing changes or pull requests.
# The builds can also be triggered manually in the Actions tab thanks to workflow dispatch.
# Only the branch called `live` is published.
Expand All @@ -7,7 +7,7 @@
name: build-ublue
on: # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows
schedule:
- cron: "20 22 * * *"
- cron: "30 16 * * *"
push:
branches:
- live
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
uses: actions/checkout@v4

- name: Add yq (for reading recipe.yml)
uses: mikefarah/yq@v4.35.1
uses: mikefarah/yq@v4.40.2

- name: Gather image data from recipe
run: |
Expand Down 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 Expand Up @@ -180,7 +180,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

# Sign container
- uses: sigstore/cosign-installer@v3.1.2
- uses: sigstore/cosign-installer@v3.2.0
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live'

- name: Sign container image
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
2 changes: 1 addition & 1 deletion config/recipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f3cf222

Please sign in to comment.