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:
  feat: add just syntax checker (blue-build#194)
  fix: use -R flag to select repo on iso-deleting `gh` commands
  feat: delete all previous ISOs when re-releasing (blue-build#185)
  build(deps): bump mikefarah/yq from 4.40.1 to 4.40.2 (blue-build#192)
  build(deps): bump sigstore/cosign-installer from 3.1.2 to 3.2.0 (blue-build#188)
  build(deps): bump mikefarah/yq from 4.35.1 to 4.40.1 (blue-build#189)
  • Loading branch information
tunix committed Nov 25, 2023
2 parents 7638b57 + 9b3db9c commit cea832c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,11 @@ jobs:
- name: Checkout Push to Registry action
uses: actions/checkout@v4

- name: Check just syntax
uses: ublue-os/just-action@v1

- 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 @@ -180,7 +183,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
1 change: 1 addition & 0 deletions .github/workflows/release-iso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
GITHUB_TOKEN: ${{ github.token }}
run: |
if gh release list -R ${{ github.repository_owner }}/${{ github.event.repository.name }} | grep "auto-iso"; then
gh release view auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --json assets -q .assets[].name | xargs -L 1 gh release delete-asset auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }}
gh release upload auto-iso ${{ steps.isogenerator.outputs.iso-path }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber
else
gh release create auto-iso ${{ steps.isogenerator.outputs.iso-path }} -t ISO -n "This is an automatically generated ISO release." -R ${{ github.repository_owner }}/${{ github.event.repository.name }}
Expand Down
2 changes: 2 additions & 0 deletions config/files/usr/share/ublue-os/just/100-bling.just
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# this file is a placeholder,
# making changes here is not supported
3 changes: 1 addition & 2 deletions config/files/usr/share/ublue-os/just/60-custom.just
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
!include /usr/share/ublue-os/just/100-bling.just

!include 100-bling.just
# Include some of your custom scripts here!

pengutool:
Expand Down

0 comments on commit cea832c

Please sign in to comment.