Merge pull request #14 from ublue-os/build-ci-changes

chore: misc fixes and cleanup in `build.yml`
This commit is contained in:
Eino Rauhala
2023-04-02 16:42:00 +03:00
committed by GitHub

View File

@@ -7,7 +7,7 @@ on:
- "**.md" - "**.md"
- "**.txt" - "**.txt"
schedule: schedule:
- cron: "20 20 * * *" # 8:20pm everyday - cron: "20 22 * * *" # 10:20pm everyday (1 hr delay after 'nvidia' builds)
push: push:
branches: branches:
- main - main
@@ -17,7 +17,7 @@ on:
workflow_dispatch: workflow_dispatch:
env: env:
IMAGE_BASE_NAME: startingpoint IMAGE_NAME: startingpoint
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
jobs: jobs:
@@ -31,7 +31,6 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
image_name: [startingpoint]
major_version: [37] major_version: [37]
include: include:
- major_version: 37 - major_version: 37
@@ -44,7 +43,7 @@ jobs:
- name: Matrix Variables - name: Matrix Variables
run: | run: |
echo "IMAGE_NAME=${{ format('{1}', matrix.image_name, env.IMAGE_BASE_NAME) }}" >> $GITHUB_ENV echo "IMAGE_NAME=${{ env.IMAGE_NAME }}" >> $GITHUB_ENV
- name: Generate tags - name: Generate tags
id: generate-tags id: generate-tags
@@ -94,11 +93,11 @@ jobs:
id: meta id: meta
with: with:
images: | images: |
$IMAGE_NAME ${{ env.IMAGE_NAME }}
labels: | labels: |
org.opencontainers.image.title=$IMAGE_NAME org.opencontainers.image.title=${{ env.IMAGE_NAME }}
org.opencontainers.image.description=A $IMAGE_NAME image for further customization org.opencontainers.image.description=A starting point for further customization of uBlue images. Make your own! https://ublue.it/making-your-own/
io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/base/base/README.md io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/startingpoint/main/README.md
io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4 io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4
# Build image using Buildah action # Build image using Buildah action
@@ -112,7 +111,6 @@ jobs:
tags: | tags: |
${{ steps.generate-tags.outputs.alias_tags }} ${{ steps.generate-tags.outputs.alias_tags }}
build-args: | build-args: |
IMAGE_NAME=${{ matrix.image_name }}
FEDORA_MAJOR_VERSION=${{ matrix.major_version }} FEDORA_MAJOR_VERSION=${{ matrix.major_version }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
oci: false oci: false