diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58da22a326..f6fee5ab16 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,7 +83,7 @@ jobs: echo "BASE_IMAGE_PUBKEY=$(yq '.base-image-pubkey' ./config/${{ matrix.recipe }})" >> $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 }} pubkey: ${{ env.BASE_IMAGE_PUBKEY }} @@ -161,7 +161,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 90afd21cf5..899f934cfe 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.1 id: isogenerator with: image-name: ${{ github.event.repository.name }} diff --git a/Containerfile b/Containerfile index 735aa5d1e1..645cfab205 100644 --- a/Containerfile +++ b/Containerfile @@ -42,6 +42,9 @@ COPY modules /tmp/modules/ # It is copied from the official container image since it's not available as an RPM. COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq +# Change this if you want different version/tag of akmods. +COPY --from=ghcr.io/ublue-os/akmods:main-39 /rpms /tmp/rpms + # Run the build script, then clean up temp files and finalize container build. RUN chmod +x /tmp/build.sh && /tmp/build.sh && \ rm -rf /tmp/* /var/* && ostree container commit 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 bd38c97020..9fbf49282e 100644 --- a/config/files/usr/share/ublue-os/just/60-custom.just +++ b/config/files/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!