From ab6fee7bd2333152f5e245efa86c94930e2338de Mon Sep 17 00:00:00 2001 From: ER Date: Sun, 2 Apr 2023 16:03:21 +0300 Subject: [PATCH 1/6] chore: only build after nvidia & main --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4dd2300..48cd406 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ on: - "**.md" - "**.txt" schedule: - - cron: "20 20 * * *" # 8:20pm everyday + - cron: "20 22 * * *" # 10:20pm everyday (1 hr delay after 'nvidia' builds) push: branches: - main From 73de53cd39fbc4a5c84e27d9df7215f91d689ab4 Mon Sep 17 00:00:00 2001 From: ER Date: Sun, 2 Apr 2023 16:06:55 +0300 Subject: [PATCH 2/6] fix: declare image name in one place --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 48cd406..b98b49a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ on: workflow_dispatch: env: - IMAGE_BASE_NAME: startingpoint + IMAGE_NAME: startingpoint IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} jobs: @@ -31,7 +31,6 @@ jobs: strategy: fail-fast: false matrix: - image_name: [startingpoint] major_version: [37] include: - major_version: 37 @@ -44,7 +43,7 @@ jobs: - name: Matrix Variables 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 id: generate-tags From 33ddd2bbac6eebbf4716af0465808f2e2fe56ebc Mon Sep 17 00:00:00 2001 From: ER Date: Sun, 2 Apr 2023 16:08:53 +0300 Subject: [PATCH 3/6] feat: change description for more information --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b98b49a..0ca47df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,7 +96,7 @@ jobs: $IMAGE_NAME labels: | org.opencontainers.image.title=$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.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4 From 6cc44ff4a9462727260733d9c973aae5a3f90c46 Mon Sep 17 00:00:00 2001 From: ER Date: Sun, 2 Apr 2023 16:26:36 +0300 Subject: [PATCH 4/6] feat: update artifacthub readme url --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ca47df..a8fadec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,7 +97,7 @@ jobs: labels: | org.opencontainers.image.title=$IMAGE_NAME 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 # Build image using Buildah action From f7c2c4ab9a0001e91be2cf484e813b47a9d8b241 Mon Sep 17 00:00:00 2001 From: ER Date: Sun, 2 Apr 2023 16:27:45 +0300 Subject: [PATCH 5/6] chore: remove image name from build args (unused) --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a8fadec..2633cc1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,7 +111,6 @@ jobs: tags: | ${{ steps.generate-tags.outputs.alias_tags }} build-args: | - IMAGE_NAME=${{ matrix.image_name }} FEDORA_MAJOR_VERSION=${{ matrix.major_version }} labels: ${{ steps.meta.outputs.labels }} oci: false From 678ab12c5ac41751775ca6898d09e2d09ea2d8b3 Mon Sep 17 00:00:00 2001 From: ER Date: Sun, 2 Apr 2023 16:31:58 +0300 Subject: [PATCH 6/6] fix: $IMAGE_NAME -> ${{ env.IMAGE_NAME }} --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2633cc1..1e264e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,9 +93,9 @@ jobs: id: meta with: images: | - $IMAGE_NAME + ${{ env.IMAGE_NAME }} labels: | - org.opencontainers.image.title=$IMAGE_NAME + org.opencontainers.image.title=${{ env.IMAGE_NAME }} 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/startingpoint/main/README.md io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4