From 8b386abe3e9e6d27513a7a1784040cbef579e79a Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Wed, 24 Apr 2024 12:14:37 +0200 Subject: [PATCH 1/2] Fail the OCI workflow if the ra version is not injected properly --- .github/workflows/rabbitmq-oci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/rabbitmq-oci.yaml b/.github/workflows/rabbitmq-oci.yaml index dfd800c0..04eb1e8d 100644 --- a/.github/workflows/rabbitmq-oci.yaml +++ b/.github/workflows/rabbitmq-oci.yaml @@ -34,6 +34,9 @@ jobs: working-directory: deps/ra run: | sed -i"_orig" "/vsn,/ s/2\\.[0-9]\\.[0-9]/${{ github.event.pull_request.head.sha || github.sha }}/" src/ra.app.src + if git diff --exit-code; then + exit 1 + fi - name: Configure Erlang uses: erlef/setup-beam@v1 with: From 01ef566ee884b3a857b06140b1dd1de9fbc80c8a Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Wed, 24 Apr 2024 12:57:47 +0200 Subject: [PATCH 2/2] Fix version injection --- .github/workflows/rabbitmq-oci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rabbitmq-oci.yaml b/.github/workflows/rabbitmq-oci.yaml index 04eb1e8d..5b4b8dd3 100644 --- a/.github/workflows/rabbitmq-oci.yaml +++ b/.github/workflows/rabbitmq-oci.yaml @@ -33,7 +33,7 @@ jobs: - name: Patch Ra version working-directory: deps/ra run: | - sed -i"_orig" "/vsn,/ s/2\\.[0-9]\\.[0-9]/${{ github.event.pull_request.head.sha || github.sha }}/" src/ra.app.src + sed -r -i"_orig" '/vsn,/ s/".*"/"${{ github.event.pull_request.head.sha || github.sha }}"/' src/ra.app.src if git diff --exit-code; then exit 1 fi