Sync Upstream (#7)

* feat: add support for image signing

* fix: fix build arguments

* docs: update Installation in README

* docs: include more detailed steps in installation section

* docs: remove unneeded verification section

* refactor: clean up image signing to line up more with upstream

* feat: add signature rather than replace to allow rebasing back to uBlue main

* style: format whitespace

* refactor: fix jq, rename cosign.yaml and cosign.pub

* Revert "refactor: clean up image signing to line up more with upstream"

* style: prepend the entry in the JSON rather than append

* fix: remove remnants from earlier image signing method

* fix: remove old signing config, using the one from the config repo instead (blue-build#124)

* fix: lowercase image name for signing

* Updating Gamescope to pull from the most recent package.

* Per the updating tools, it appears that org.gnome.Games is end of life and will no longer get updates.

* Revert "Per the updating tools, it appears that org.gnome.Games is end of life and will no longer get updates."

This reverts commit 0f80d30.

* fix: remove GNOME Games, is deprecated

* chore: justom.just add line break at EOF

* chore: autostart.desktop add line break at EOF

* fix: capitalize first character of comment (blue-build#132)

* feat: ISO build action (blue-build#133)

* feat: base iso release workflow
* does not produce a functional ISO yet
needs boot_menu

* chore(dev): start iso workflow on iso push

* fix: rename release-iso to release-please

* refactor: use github-cli to create release

* fix: remove job dependencies

* chore: basic boot menu

* fix: add permission to create release

* fix: delegate tag for auto-iso releases,..
delete old version when rerunning

* fix: multiline string for multine cmds

* fix: specify gh repo in old release delete

* fix: only create release if doesn't exist

* fix: boot menu double user field

* fix: clobber iso

* chore: neutral defaults for boot menu

* feat: run iso when iso-related changes pushed

* docs: README section for ISO

* fix: always get version tags (blue-build#134)

---------

Co-authored-by: Scott Ames <[email protected]>

* docs: minor fixes to documentation (blue-build#136)

* style: Remove extra whitespace in link description

* fix: Fix link to make-your-own documentation

* fix: dont add malformed tags if $MAJOR_VERSION is empty

* build(deps): bump sigstore/cosign-installer from 3.1.1 to 3.1.2

Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/sigstore/cosign-installer/releases)
- [Commits](sigstore/cosign-installer@v3.1.1...v3.1.2)

---
updated-dependencies:
- dependency-name: sigstore/cosign-installer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: gerblesh <[email protected]>
Co-authored-by: Jorge O. Castro <[email protected]>
Co-authored-by: ER <[email protected]>
Co-authored-by: Waffleophagus <[email protected]>
Co-authored-by: plata <[email protected]>
Co-authored-by: jh-devv <[email protected]>
Co-authored-by: EinoHR <[email protected]>
Co-authored-by: Scott Ames <[email protected]>
Co-authored-by: Gordon Schulz <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/build.yml

@@ -81,10 +81,14 @@ jobs:
           BUILD_TAGS=()
           # Have tags for tracking builds during pull request
           SHA_SHORT="${GITHUB_SHA::7}"
-          COMMIT_TAGS+=("pr-${{ github.event.number }}-${MAJOR_VERSION}")
-          COMMIT_TAGS+=("${SHA_SHORT}-${MAJOR_VERSION}")
 
-          BUILD_TAGS=("${MAJOR_VERSION}" "${MAJOR_VERSION}-${TIMESTAMP}")
+          # Using clever bash string templating, https://stackoverflow.com/q/40771781
+          # don't make malformed tags if $MAJOR_VERSION is empty (base-image didn't include proper labels) --
+          COMMIT_TAGS+=("pr-${{ github.event.number }}${MAJOR_VERSION:+-$MAJOR_VERSION}")
+          COMMIT_TAGS+=("${SHA_SHORT}${MAJOR_VERSION:+-$MAJOR_VERSION}")
+
+          BUILD_TAGS=("${MAJOR_VERSION}" "${MAJOR_VERSION:+$MAJOR_VERSION-}${TIMESTAMP}")
+          # --
 
           BUILD_TAGS+=("${TIMESTAMP}")
           BUILD_TAGS+=("latest")
@@ -125,7 +129,7 @@ jobs:
         uses: ASzc/change-string-case-action@v5
         with:
           string: ${{ env.IMAGE_REGISTRY }}
-      
+
       - name: Lowercase Image
         id: image_case
         uses: ASzc/change-string-case-action@v5
@@ -176,7 +180,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       # Sign container
-      - uses: sigstore/[email protected].1
+      - uses: sigstore/[email protected].2
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live'
 
       - name: Sign container image

Containerfile

@@ -30,9 +30,6 @@ COPY usr /usr
 # Copy public key
 COPY cosign.pub /usr/share/ublue-os/cosign.pub
 
-# Copy base signing config
-COPY usr/etc/containers /usr/etc/
-
 # Copy greetd & systemd configs
 COPY etc /etc
 

README.md

@@ -8,7 +8,7 @@ For more info, check out the [uBlue homepage](https://universal-blue.org/) and t
 
 ## Getting started
 
-See the [Make Your Own -page in the documentation](https://universal-blue.org/tinker/make-your-own/) for quick setup instructions for setting up your own repository based on this template.
+See the [Make Your Own-page in the documentation](https://universal-blue.org/tinker/make-your-own/) for quick setup instructions for setting up your own repository based on this template.
 
 Don't worry, it only requires some basic knowledge about using the terminal and git.
 
@@ -155,4 +155,5 @@ After doing that, you'll be able to run the following commands:
 - `just nix-me-up` - Install Nix with dnkmmr69420's Nix Silverblue install script
 - `just update` - Update rpm-ostree, flatpaks, and distroboxes in one command
 
-Check the [just website](https://just.systems) for tips on modifying and adding your own recipes.
+Check the [just website](https://just.systems) for tips on modifying and adding your own recipes.
+