From 05bc43fd463ee701e5431f87e52ef6ddc1b1e1e1 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Mon, 22 Aug 2022 16:03:53 +0200 Subject: ci: Update workflows to run on main branch --- .github/workflows/integration_test.yml | 6 +++--- .github/workflows/shellcheck_test.yml | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 5adfd04d..5a2c97c0 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -1,15 +1,15 @@ name: Integration test on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master, rhel*-branch ] + branches: [ main, rhel*-branch ] release: types: [ published, created ] jobs: buildCheck: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Repository checkout uses: actions/checkout@v3 diff --git a/.github/workflows/shellcheck_test.yml b/.github/workflows/shellcheck_test.yml index 1235c4b7..30e46f63 100644 --- a/.github/workflows/shellcheck_test.yml +++ b/.github/workflows/shellcheck_test.yml @@ -1,11 +1,11 @@ name: Differential ShellCheck on: pull_request: - branches: [ master, rhel*-branch ] + branches: [ main, rhel*-branch ] jobs: shellCheck: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout @@ -16,6 +16,4 @@ jobs: - name: Differential ShellCheck uses: redhat-plumbers-in-action/differential-shellcheck@v2 with: - ignored-codes: .github/.diff-shellcheck-exceptions.txt - shell-scripts: .github/.diff.shellcheck-scripts.txt token: ${{ secrets.GITHUB_TOKEN }} -- cgit v1.2.1