diff options
| author | Jan Macku <jamacku@redhat.com> | 2022-08-22 16:03:53 +0200 |
|---|---|---|
| committer | Jan Macku <jamacku@redhat.com> | 2022-08-22 16:14:49 +0200 |
| commit | 05bc43fd463ee701e5431f87e52ef6ddc1b1e1e1 (patch) | |
| tree | 9f805b693bfaa44b1fa37ca4cfc8adf51dcf8928 | |
| parent | adaeb832af822705c737eece9e99ac06c665d049 (diff) | |
| download | initscripts-05bc43fd463ee701e5431f87e52ef6ddc1b1e1e1.tar initscripts-05bc43fd463ee701e5431f87e52ef6ddc1b1e1e1.tar.gz initscripts-05bc43fd463ee701e5431f87e52ef6ddc1b1e1e1.tar.bz2 initscripts-05bc43fd463ee701e5431f87e52ef6ddc1b1e1e1.tar.xz initscripts-05bc43fd463ee701e5431f87e52ef6ddc1b1e1e1.zip | |
ci: Update workflows to run on main branch
| -rw-r--r-- | .github/workflows/integration_test.yml | 6 | ||||
| -rw-r--r-- | .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 }} |