From 976f5e053537e424edcdcb2325230d370454efd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Nykr=C3=BDn?= Date: Mon, 7 Jun 2021 19:40:22 +0200 Subject: [PATCH] Merge pull request #3 from redhat-plumbers/reconfigure-gh-actions ci: drop the hardcoded repo owner name --- .github/workflows/container.yml | 6 +++--- .github/workflows/integration.yml | 6 +++--- .github/workflows/lint.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 0706bf48..32bb7f16 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' @@ -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 89310d44..18582364 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: @@ -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" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7b1b8ee7..f6778a65 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: