From 68e5b850206cd933c9fc5c19bb10472bb29b8fae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Nov 2023 12:39:31 +0000 Subject: [PATCH 1/6] build(deps): bump mikefarah/yq from 4.35.1 to 4.40.1 (#189) Bumps [mikefarah/yq](https://github.com/mikefarah/yq) from 4.35.1 to 4.40.1. - [Release notes](https://github.com/mikefarah/yq/releases) - [Changelog](https://github.com/mikefarah/yq/blob/master/release_notes.txt) - [Commits](https://github.com/mikefarah/yq/compare/v4.35.1...v4.40.1) --- updated-dependencies: - dependency-name: mikefarah/yq dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2db9052ceb..751a0130cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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.1 - name: Gather image data from recipe run: | From 16792c3f17cf6d8d5ee22d6c5dd31605d7478e0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Nov 2023 12:43:01 +0000 Subject: [PATCH 2/6] build(deps): bump sigstore/cosign-installer from 3.1.2 to 3.2.0 (#188) Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.1.2 to 3.2.0. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](https://github.com/sigstore/cosign-installer/compare/v3.1.2...v3.2.0) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 751a0130cf..764f5587bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 From 6b4e4ab3fcced6d2d07fe5b1e5b99cf07c888a5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 12:43:11 +0000 Subject: [PATCH 3/6] build(deps): bump mikefarah/yq from 4.40.1 to 4.40.2 (#192) Bumps [mikefarah/yq](https://github.com/mikefarah/yq) from 4.40.1 to 4.40.2. - [Release notes](https://github.com/mikefarah/yq/releases) - [Changelog](https://github.com/mikefarah/yq/blob/master/release_notes.txt) - [Commits](https://github.com/mikefarah/yq/compare/v4.40.1...v4.40.2) --- updated-dependencies: - dependency-name: mikefarah/yq dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 764f5587bb..b428c6e9d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: uses: actions/checkout@v4 - name: Add yq (for reading recipe.yml) - uses: mikefarah/yq@v4.40.1 + uses: mikefarah/yq@v4.40.2 - name: Gather image data from recipe run: | From a5b47ac3061384e8b9896458be820ef5527f6668 Mon Sep 17 00:00:00 2001 From: xyny <60004820+xynydev@users.noreply.github.com> Date: Mon, 20 Nov 2023 16:20:24 +0000 Subject: [PATCH 4/6] feat: delete all previous ISOs when re-releasing (#185) --- .github/workflows/release-iso.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 76682bec54..a913affc40 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -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 --json assets -q .assets[].name | xargs -L 1 gh release delete-asset auto-iso 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 }} From 9000df92242b96dcf1754541584c429ef7dd68f0 Mon Sep 17 00:00:00 2001 From: xyny <60004820+xynydev@users.noreply.github.com> Date: Wed, 22 Nov 2023 12:23:15 +0000 Subject: [PATCH 5/6] fix: use -R flag to select repo on iso-deleting `gh` commands --- .github/workflows/release-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index a913affc40..4b17e8d8fe 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -35,7 +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 --json assets -q .assets[].name | xargs -L 1 gh release delete-asset auto-iso + 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 }} From 9b3db9c3ac3f4615ada73f027e252ec746bce5cb Mon Sep 17 00:00:00 2001 From: ArtikusHG <24320212+ArtikusHG@users.noreply.github.com> Date: Wed, 22 Nov 2023 15:26:27 +0000 Subject: [PATCH 6/6] feat: add just syntax checker (#194) * feat: add just syntax checker * fix: create empty file to pass just syntax check * fix: use relative path to pass just syntax check * fix: justfiles cannot be empty to pass the syntax check * fix: format justfiles * docs: 100-bling.just explain purpose --------- Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com> --- .github/workflows/build.yml | 3 +++ config/files/usr/share/ublue-os/just/100-bling.just | 2 ++ config/files/usr/share/ublue-os/just/60-custom.just | 3 +-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 config/files/usr/share/ublue-os/just/100-bling.just diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b428c6e9d7..01767d0491 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,6 +54,9 @@ 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.40.2 diff --git a/config/files/usr/share/ublue-os/just/100-bling.just b/config/files/usr/share/ublue-os/just/100-bling.just new file mode 100644 index 0000000000..9e3a89ba4b --- /dev/null +++ b/config/files/usr/share/ublue-os/just/100-bling.just @@ -0,0 +1,2 @@ +# this file is a placeholder, +# making changes here is not supported diff --git a/config/files/usr/share/ublue-os/just/60-custom.just b/config/files/usr/share/ublue-os/just/60-custom.just index f1dd14804d..bd38c97020 100644 --- a/config/files/usr/share/ublue-os/just/60-custom.just +++ b/config/files/usr/share/ublue-os/just/60-custom.just @@ -1,3 +1,2 @@ -!include /usr/share/ublue-os/just/100-bling.just - +!include 100-bling.just # Include some of your custom scripts here!