Skip to content

Commit

Permalink
Merge branch 'template' into pubkey-recipe
Browse files Browse the repository at this point in the history
  • Loading branch information
xynydev authored Jan 24, 2024
2 parents 2b5f6aa + 5cf7429 commit e7bd802
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].1
uses: EyeCantCU/cosign-action/[email protected].2
with:
containers: ${{ env.BASE_IMAGE_NAME }}:${{ env.IMAGE_MAJOR_VERSION }}
pubkey: ${{ env.BASE_IMAGE_PUBKEY }}
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-iso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 3 additions & 0 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/files/usr/share/ublue-os/just/60-custom.just
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
!include 100-bling.just
import '100-bling.just'
# Include some of your custom scripts here!

0 comments on commit e7bd802

Please sign in to comment.