diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-11-16 10:00:53 +0100 |
|---|---|---|
| committer | mergify-bot <noreply@mergify.io> | 2021-11-16 09:05:08 +0000 |
| commit | dc0a495b36f4add3c7117a72fe9e727236ce394d (patch) | |
| tree | e49398ad0c264393bea3d530bc7dfdcbd04f5751 | |
| parent | 8407536aef2b86c7f23718cf5ade08185d748438 (diff) | |
| download | rabbitmq-server-git-dc0a495b36f4add3c7117a72fe9e727236ce394d.tar.gz | |
Fixup merge
(cherry picked from commit 7bb75ac61b0feb820244829b25141a025b38e0e9)
# Conflicts:
# .github/workflows/test.yaml
| -rw-r--r-- | .github/workflows/test-mixed-versions.yaml | 4 | ||||
| -rw-r--r-- | .github/workflows/test.yaml | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/test-mixed-versions.yaml b/.github/workflows/test-mixed-versions.yaml index 71df7a4b5b..d9fe747bc9 100644 --- a/.github/workflows/test-mixed-versions.yaml +++ b/.github/workflows/test-mixed-versions.yaml @@ -29,16 +29,12 @@ jobs: timeout-minutes: 120 steps: - name: CHECKOUT REPOSITORY -<<<<<<< HEAD - uses: actions/checkout@v2.3.4 -======= uses: actions/checkout@v2.4.0 - name: MOUNT BAZEL CACHE uses: actions/cache@v1 with: path: "/home/runner/repo-cache/" key: repo-cache ->>>>>>> 470c94692c (Use the GitHub Actions Cache in conjuction with buildbuddy) - name: CONFIGURE BAZEL run: | cat << EOF >> user.bazelrc diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3498f2ea2b..cb63b7f82b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -27,19 +27,25 @@ jobs: steps: - name: CHECKOUT REPOSITORY <<<<<<< HEAD +<<<<<<< HEAD uses: actions/checkout@v2 ======= <<<<<<< HEAD uses: actions/checkout@v2.3.4 ======= +======= +>>>>>>> 7bb75ac61b (Fixup merge) uses: actions/checkout@v2.4.0 - name: MOUNT BAZEL CACHE uses: actions/cache@v1 with: path: "/home/runner/repo-cache/" key: repo-cache +<<<<<<< HEAD >>>>>>> 470c94692c (Use the GitHub Actions Cache in conjuction with buildbuddy) >>>>>>> 13012c3981 (Use the GitHub Actions Cache in conjuction with buildbuddy) +======= +>>>>>>> 7bb75ac61b (Fixup merge) - name: CONFIGURE BAZEL run: | cat << EOF >> user.bazelrc |