|
 |
c2f1e0 |
From 976f5e053537e424edcdcb2325230d370454efd5 Mon Sep 17 00:00:00 2001
|
|
|
c2f1e0 |
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Nykr=C3=BDn?= <lnykryn@redhat.com>
|
|
|
c2f1e0 |
Date: Mon, 7 Jun 2021 19:40:22 +0200
|
|
|
c2f1e0 |
Subject: [PATCH] Merge pull request #3 from
|
|
|
c2f1e0 |
redhat-plumbers/reconfigure-gh-actions
|
|
|
c2f1e0 |
|
|
|
c2f1e0 |
ci: drop the hardcoded repo owner name
|
|
|
c2f1e0 |
---
|
|
|
c2f1e0 |
.github/workflows/container.yml | 6 +++---
|
|
|
c2f1e0 |
.github/workflows/integration.yml | 6 +++---
|
|
|
c2f1e0 |
.github/workflows/lint.yml | 4 ++--
|
|
|
c2f1e0 |
3 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
c2f1e0 |
|
|
|
c2f1e0 |
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
|
|
|
c2f1e0 |
index 0706bf48..32bb7f16 100644
|
|
|
c2f1e0 |
--- a/.github/workflows/container.yml
|
|
|
c2f1e0 |
+++ b/.github/workflows/container.yml
|
|
|
c2f1e0 |
@@ -3,12 +3,12 @@ on:
|
|
|
c2f1e0 |
schedule:
|
|
|
c2f1e0 |
- cron: '30 11 * * *' # every day at 4:40
|
|
|
c2f1e0 |
push:
|
|
|
c2f1e0 |
- branches: [ master ]
|
|
|
c2f1e0 |
+ branches: [ main ]
|
|
|
c2f1e0 |
paths:
|
|
|
c2f1e0 |
- 'test/container/**'
|
|
|
c2f1e0 |
- '.github/workflows/container.yml'
|
|
|
c2f1e0 |
pull_request:
|
|
|
c2f1e0 |
- branches: [ master ]
|
|
|
c2f1e0 |
+ branches: [ main ]
|
|
|
c2f1e0 |
paths:
|
|
|
c2f1e0 |
- 'test/container/**'
|
|
|
c2f1e0 |
- '.github/workflows/container.yml'
|
|
|
c2f1e0 |
@@ -50,5 +50,5 @@ jobs:
|
|
|
c2f1e0 |
uses: docker/build-push-action@v2
|
|
|
c2f1e0 |
with:
|
|
|
c2f1e0 |
file: test/container/${{ matrix.config.dockerfile }}
|
|
|
c2f1e0 |
- tags: ghcr.io/dracutdevs/${{ matrix.config.tag }}
|
|
|
c2f1e0 |
+ tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.config.tag }}
|
|
|
c2f1e0 |
push: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
|
|
|
c2f1e0 |
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
|
|
|
c2f1e0 |
index 89310d44..18582364 100644
|
|
|
c2f1e0 |
--- a/.github/workflows/integration.yml
|
|
|
c2f1e0 |
+++ b/.github/workflows/integration.yml
|
|
|
c2f1e0 |
@@ -2,7 +2,7 @@ name: Integration Test
|
|
|
c2f1e0 |
|
|
|
c2f1e0 |
on:
|
|
|
c2f1e0 |
pull_request:
|
|
|
c2f1e0 |
- branches: [ master ]
|
|
|
c2f1e0 |
+ branches: [ main ]
|
|
|
c2f1e0 |
|
|
|
c2f1e0 |
jobs:
|
|
|
c2f1e0 |
basic:
|
|
|
c2f1e0 |
@@ -24,7 +24,7 @@ jobs:
|
|
|
c2f1e0 |
]
|
|
|
c2f1e0 |
fail-fast: false
|
|
|
c2f1e0 |
container:
|
|
|
c2f1e0 |
- image: ghcr.io/dracutdevs/${{ matrix.container }}
|
|
|
c2f1e0 |
+ image: ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}
|
|
|
c2f1e0 |
options: "--privileged -v /dev:/dev"
|
|
|
c2f1e0 |
steps:
|
|
|
c2f1e0 |
- name: "Checkout Repository"
|
|
|
c2f1e0 |
@@ -69,7 +69,7 @@ jobs:
|
|
|
c2f1e0 |
]
|
|
|
c2f1e0 |
fail-fast: false
|
|
|
c2f1e0 |
container:
|
|
|
c2f1e0 |
- image: ghcr.io/dracutdevs/${{ matrix.container }}
|
|
|
c2f1e0 |
+ image: ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}
|
|
|
c2f1e0 |
options: "--privileged -v /dev:/dev"
|
|
|
c2f1e0 |
steps:
|
|
|
c2f1e0 |
- name: "Checkout Repository"
|
|
|
c2f1e0 |
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
|
|
|
c2f1e0 |
index 7b1b8ee7..f6778a65 100644
|
|
|
c2f1e0 |
--- a/.github/workflows/lint.yml
|
|
|
c2f1e0 |
+++ b/.github/workflows/lint.yml
|
|
|
c2f1e0 |
@@ -2,9 +2,9 @@ name: Lint
|
|
|
c2f1e0 |
|
|
|
c2f1e0 |
on:
|
|
|
c2f1e0 |
push:
|
|
|
c2f1e0 |
- branches: [ master ]
|
|
|
c2f1e0 |
+ branches: [ main ]
|
|
|
c2f1e0 |
pull_request:
|
|
|
c2f1e0 |
- branches: [ master ]
|
|
|
c2f1e0 |
+ branches: [ main ]
|
|
|
c2f1e0 |
|
|
|
c2f1e0 |
jobs:
|
|
|
c2f1e0 |
lint-c:
|
|
|
c2f1e0 |
|