From 85958b2f8dcbd44474ca11b9dae6d9f2e1cdbed5 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 24 Jan 2023 13:45:14 -0500
Subject: [PATCH] Switch to pushing to integrated registry

It's just easier.
---
 .github/workflows/build.yaml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5d459cf..ac69de8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -10,7 +10,11 @@ on:
   workflow_dispatch: {}
 
 env:
-  REGISTRY: quay.io/cgwalters
+  REGISTRY: ghcr.io
+
+permissions:
+  contents: read
+  packages: write
 
 jobs:
   build:
@@ -20,7 +24,8 @@ jobs:
       matrix:
         os: ["fedora", "c9s"]
     container:
-      image: quay.io/fedora/fedora-coreos:testing-devel
+      # Yes, we're using this as a *builder* image.
+      image: quay.io/fedora/fedora-coreos:stable
       options: "--user root --privileged -v /var/tmp:/var/tmp -v /tmp:/tmp"
     steps:
       - uses: actions/checkout@v3
@@ -29,14 +34,11 @@ jobs:
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Install deps
         run: rpm-ostree install distribution-gpg-keys
-      - name: Login to registry
-        shell: bash
-        env:
-          REGISTRY_CREDS: ${{ secrets.QUAY }}
-        run: podman login -u="cgwalters+gha" -p="${REGISTRY_CREDS}" quay.io
+      - name: Login
+        run: podman login --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
       # Make force triggering a build always build the image
-      - run: echo "force_initialize=1" >> $GITHUB_ENV
-        if: github.event_name == 'workflow_dispatch'
+      #- run: echo "force_initialize=1" >> $GITHUB_ENV
+      #  if: github.event_name == 'workflow_dispatch'
       - name: Build ostree container
         run: rpm-ostree compose image --format=registry ${force_initialize:+--initialize} ${{ matrix.os }}.yaml ${{ env.REGISTRY }}/${{ matrix.os }}-oscore