From ea7d287594afa40378c8f519c2816e0a8e7c57b4 Mon Sep 17 00:00:00 2001
From: Sukarn <10946339+sukarn-m@users.noreply.github.com>
Date: Sat, 13 Jan 2024 13:46:53 +0530
Subject: [PATCH] Merge upstream changes

---
 .github/workflows/build.yml                                | 4 ++--
 .github/workflows/release-iso.yml                          | 2 +-
 config/files/common/usr/share/ublue-os/just/60-custom.just | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 92ce131..31ebe48 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
           echo "BASE_IMAGE_NAME=$(echo $BASE_IMAGE | sed 's/.*\/.*\///')" >> $GITHUB_ENV
 
       - name: Verify base image
-        uses: EyeCantCU/cosign-action/verify@v0.2.1
+        uses: EyeCantCU/cosign-action/verify@v0.2.2
         with:
           containers: ${{ env.BASE_IMAGE_NAME }}:${{ env.IMAGE_MAJOR_VERSION }}
 
@@ -138,7 +138,7 @@ jobs:
           string: ${{ env.IMAGE_NAME }}
 
       - name: Maximize build space
-        uses: AdityaGarg8/remove-unwanted-software@v1
+        uses: AdityaGarg8/remove-unwanted-software@v2
         with:
           remove-dotnet: 'true'
           remove-android: 'true'
diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml
index 6342b62..5b23b78 100644
--- a/.github/workflows/release-iso.yml
+++ b/.github/workflows/release-iso.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Generate ISO  
-        uses: ublue-os/isogenerator@v2.2.0
+        uses: ublue-os/isogenerator@v2.3.0
         id: isogenerator
         with:
           image-name: sukarn-ublue
diff --git a/config/files/common/usr/share/ublue-os/just/60-custom.just b/config/files/common/usr/share/ublue-os/just/60-custom.just
index bd38c97..9fbf492 100644
--- a/config/files/common/usr/share/ublue-os/just/60-custom.just
+++ b/config/files/common/usr/share/ublue-os/just/60-custom.just
@@ -1,2 +1,2 @@
-!include 100-bling.just
+import '100-bling.just'
 # Include some of your custom scripts here!