Skip to content

Commit

Permalink
fix: use ENV instead of outputs
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Mihalik committed Jun 29, 2024
1 parent 47b82f6 commit 455c52c
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,22 @@ jobs:
kernel_flavor=fsync
upstrem_repo=bazzite
fi
echo "version=$ver" >> $GITHUB_OUTPUT
echo "kernel_release=${KERNEL_RELEASE}" >> $GITHUB_OUTPUT
echo "kernel_flavor=${kernel_flavor}" >> $GITHUB_OUTPUT
echo "upstream_repo=${upstream_repo}" >> $GITHUB_OUTPUT
echo "version=$ver" >> $GITHUB_ENV
echo "kernel_release=${KERNEL_RELEASE}" >> $GITHUB_ENV
echo "kernel_flavor=${kernel_flavor}" >> $GITHUB_ENV
echo "upstream_repo=${upstream_repo}" >> $GITHUB_ENV
- name: Verify Base Image
uses: EyeCantCU/cosign-action/verify@v0.2.2
with:
containers: ${{ matrix.image }}:stable
pubkey: https://raw.githubusercontent.com/ublue-os/${{ steps.labels.outputs.upstream_repo }}/main/cosign.pub
pubkey: https://raw.githubusercontent.com/ublue-os/${{ env.upstream_repo }}/main/cosign.pub
registry: ghcr.io/ublue-os

- name: Verify Akmods Image
uses: EyeCantCU/cosign-action/verify@v0.2.2
with:
containers: akmods:${{ steps.labels.outputs.fedora_version }}-${{ steps.labels.outputs.kernel_flavor }}
containers: akmods:${{ env.fedora_version }}-${{ env.kernel_flavor }}
pubkey: https://raw.githubusercontent.com/ublue-os/akmods/main/cosign.pub
registry: ghcr.io/ublue-os

Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
attempt_limit: 3
attempt_delay: 15000
command: podman pull ghcr.io/ublue-os/${{ matrix.image }}:stable
podman pull ghcr.io/ublue-os/akmods:${{ steps.labels.outputs.fedora_version }}-${{ steps.labels.outputs.kernel_flavor }}
podman pull ghcr.io/ublue-os/akmods:${{ env.fedora_version }}-${{ env.kernel_flavor }}

- name: Image Metadata
uses: docker/metadata-action@v5
Expand All @@ -111,8 +111,8 @@ jobs:
labels: |
org.opencontainers.image.title=${{ env.IMAGE_NAME }}
org.opencontainers.image.description=m2os is my OCI image built from ublue projects. It mainly extends bazzite/bluefin for my uses.
org.opencontainers.image.version=${{ steps.labels.outputs.version }}
ostree.linux=${{ steps.labels.outputs.kernel_release }}.x86_64
org.opencontainers.image.version=${{ env.version }}
ostree.linux=${{ env.kernel_release }}.x86_64
- name: Build Image
id: build_image
Expand All @@ -124,8 +124,8 @@ jobs:
tags: ${{ steps.generate_tags.outputs.build_tags }}
build-args: |
IMAGE=${{ matrix.image }}
FEDORA_VERSION=${{ steps.labels.outputs.fedora_version }}
KERNEL_FLAVOR=${{ steps.labels.outputs.kernel_flavor }}
FEDORA_VERSION=${{ env.fedora_version }}
KERNEL_FLAVOR=${{ env.kernel_flavor }}
labels: ${{ steps.meta.outputs.labels }}
oci: false

Expand Down

0 comments on commit 455c52c

Please sign in to comment.