diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-17 14:57:17 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-17 14:57:17 +0000 |
| commit | 8c80e4dce14eed4e3c06b16fc307c6c7d20b9af8 (patch) | |
| tree | 4477eaed15415ddadc3e88205234659628759415 /.github | |
| parent | Releasing progress-linux version 1:2.13.0-1~progress7.99u1. (diff) | |
| download | bash-completion-8c80e4dce14eed4e3c06b16fc307c6c7d20b9af8.tar.xz bash-completion-8c80e4dce14eed4e3c06b16fc307c6c7d20b9af8.zip | |
Merging upstream version 1:2.14.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | .github/release-please-manifest.json | 2 | ||||
| -rw-r--r-- | .github/workflows/ci.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/update-docker-images.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/release-please-manifest.json b/.github/release-please-manifest.json index 6f6cd64..a3b85fa 100644 --- a/.github/release-please-manifest.json +++ b/.github/release-please-manifest.json @@ -1 +1 @@ -{".":"2.13.0"} +{".":"2.14.0"} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 60f9adb..6a8edbd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main jobs: pre-commit: diff --git a/.github/workflows/update-docker-images.yml b/.github/workflows/update-docker-images.yml index 5f6e269..0d0df35 100644 --- a/.github/workflows/update-docker-images.yml +++ b/.github/workflows/update-docker-images.yml @@ -18,7 +18,7 @@ on: jobs: update-test-image: runs-on: ubuntu-latest - if: github.repository_owner == 'scop' && github.ref == 'refs/heads/master' + if: github.repository_owner == 'scop' && github.ref == 'refs/heads/main' strategy: matrix: include: |