diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-03-09 11:16:36 +0100 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-03-09 11:16:36 +0100 |
| commit | 55137107e09a45d43026c1ba41ad79b35621d077 (patch) | |
| tree | a72bec7008c5600cb6b5103426174ff3e16b3633 | |
| parent | 1937031b6b537e9568e727ce8c8ac3ed50465065 (diff) | |
| download | rabbitmq-server-git-55137107e09a45d43026c1ba41ad79b35621d077.tar.gz | |
WIP: GitHub Actions without docker images 5
| -rw-r--r-- | .github/workflows/test-erlang-otp-23.1.yaml | 19 | ||||
| -rw-r--r-- | workflow_sources/test/prepare.lib.yml | 19 |
2 files changed, 14 insertions, 24 deletions
diff --git a/.github/workflows/test-erlang-otp-23.1.yaml b/.github/workflows/test-erlang-otp-23.1.yaml index 83578a7e84..591796165b 100644 --- a/.github/workflows/test-erlang-otp-23.1.yaml +++ b/.github/workflows/test-erlang-otp-23.1.yaml @@ -21,7 +21,7 @@ jobs: branch_or_tag_name=${GITHUB_REF#refs/*/} echo "::set-output name=branch_or_tag_name::$branch_or_tag_name" - name: CACHE SECONDARY UMBRELLAS - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: umbrellas key: secondary-umbrellas-v3.7.28-v3.8.9-erlang-23.1 @@ -35,16 +35,12 @@ jobs: rm -rf "$umbrella" # Fetch the master Umbrella; the final umbrellas are created from # the master copy. - if ! test -d umbrellas/master; then - git config --global advice.detachedHead false - git clone \ - https://github.com/rabbitmq/rabbitmq-public-umbrella.git \ - umbrellas/master - make -C umbrellas/master co # To get RabbitMQ components. - fi - # We copy the master Umbrella and checkout the appropriate tag. - cp -a umbrellas/master "$umbrella" - git -C "$umbrella" checkout "master" + git config --global advice.detachedHead false + git clone \ + https://github.com/rabbitmq/rabbitmq-public-umbrella.git \ + $umbrella + git -C "$umbrella" checkout "$version" + make -C $umbrella co # To get RabbitMQ components. make -C "$umbrella" up BRANCH="$version" # To remove third-party deps which were checked out when the # projects were on the `master` branch. Thus, possibly not the @@ -58,7 +54,6 @@ jobs: rm -rf "$umbrella"/deps/*/{.git,test} "$umbrella"/.git fi done - rm -fr umbrellas/master - name: CREATE SECONDARY UMBRELLAS ARCHIVE run: | set -ex diff --git a/workflow_sources/test/prepare.lib.yml b/workflow_sources/test/prepare.lib.yml index 95567209ed..0ef395c7f6 100644 --- a/workflow_sources/test/prepare.lib.yml +++ b/workflow_sources/test/prepare.lib.yml @@ -41,7 +41,7 @@ prepare: #@ end #@ if erlang_version != "git": - name: CACHE SECONDARY UMBRELLAS - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: umbrellas key: #@ "secondary-umbrellas-{}-erlang-{}".format("-".join(data.values.secondary_umbrella_gitrefs), erlang_version) @@ -56,16 +56,12 @@ prepare: rm -rf "$umbrella" # Fetch the master Umbrella; the final umbrellas are created from # the master copy. - if ! test -d umbrellas/master; then - git config --global advice.detachedHead false - git clone \ - https://github.com/rabbitmq/rabbitmq-public-umbrella.git \ - umbrellas/master - make -C umbrellas/master co # To get RabbitMQ components. - fi - # We copy the master Umbrella and checkout the appropriate tag. - cp -a umbrellas/master "$umbrella" - git -C "$umbrella" checkout "master" + git config --global advice.detachedHead false + git clone \ + https://github.com/rabbitmq/rabbitmq-public-umbrella.git \ + $umbrella + git -C "$umbrella" checkout "$version" + make -C $umbrella co # To get RabbitMQ components. make -C "$umbrella" up BRANCH="$version" # To remove third-party deps which were checked out when the # projects were on the `master` branch. Thus, possibly not the @@ -79,7 +75,6 @@ prepare: rm -rf "$umbrella"/deps/*/{.git,test} "$umbrella"/.git fi done - rm -fr umbrellas/master - name: CREATE SECONDARY UMBRELLAS ARCHIVE run: | set -ex |