From db2f2ac7cff10d4ec0c8ee04aeaa975d12b45009 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 7 Jun 2021 18:02:21 +0200
Subject: [PATCH 1/2] ci: fix the main branch ref

rhel-only
Related: #1966446
---
 .github/workflows/container.yml   | 4 ++--
 .github/workflows/integration.yml | 2 +-
 .github/workflows/lint.yml        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 0706bf480b..e010e7dce3 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -3,12 +3,12 @@ on:
     schedule:
         -  cron: '30 11 * * *'   # every day at 4:40
     push:
-        branches: [ master ]
+        branches: [ main ]
         paths:
             - 'test/container/**'
             - '.github/workflows/container.yml'
     pull_request:
-        branches: [ master ]
+        branches: [ main ]
         paths:
             - 'test/container/**'
             - '.github/workflows/container.yml'
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 89310d445d..44df563683 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -2,7 +2,7 @@ name: Integration Test
 
 on:
     pull_request:
-        branches: [ master ]
+        branches: [ main ]
 
 jobs:
     basic:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 7b1b8ee74b..f6778a6594 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -2,9 +2,9 @@ name: Lint
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   lint-c:

From d4274f093a214c3b4e7d4402ae0c26710d4d8d03 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 7 Jun 2021 17:58:29 +0200
Subject: [PATCH 2/2] ci: drop the hardcoded repo owner name

Otherwise the image push fails with permission error.

rhel-only
Related: #1966446
---
 .github/workflows/container.yml   | 2 +-
 .github/workflows/integration.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index e010e7dce3..32bb7f16ed 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -50,5 +50,5 @@ jobs:
                 uses: docker/build-push-action@v2
                 with:
                     file: test/container/${{ matrix.config.dockerfile }}
-                    tags: ghcr.io/dracutdevs/${{ matrix.config.tag }}
+                    tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.config.tag }}
                     push: ${{ github.event_name == 'push' ||  github.event_name == 'schedule' }}
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 44df563683..18582364ac 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -24,7 +24,7 @@ jobs:
                 ]
             fail-fast: false
         container:
-            image: ghcr.io/dracutdevs/${{ matrix.container }}
+            image: ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}
             options: "--privileged -v /dev:/dev"
         steps:
             -   name: "Checkout Repository"
@@ -69,7 +69,7 @@ jobs:
                 ]
             fail-fast: false
         container:
-            image: ghcr.io/dracutdevs/${{ matrix.container }}
+            image: ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}
             options: "--privileged -v /dev:/dev"
         steps:
             -   name: "Checkout Repository"