From 01e0d203b920b7c79851ee2f951ba1fc48ad5bac Mon Sep 17 00:00:00 2001
From: Igor Zolotarev <63460867+yngvar-antonsson@users.noreply.github.com>
Date: Fri, 15 Mar 2024 11:16:45 +0100
Subject: [PATCH] Use common etcd action instead of local (#2196)

---
 .github/actions/setup-etcd/action.yml       | 34 ---------------------
 .github/workflows/backend-test.yml          | 16 ++++------
 .github/workflows/nightly-test.yml          |  8 ++---
 .github/workflows/reusable-backend-test.yml |  7 ++---
 4 files changed, 12 insertions(+), 53 deletions(-)
 delete mode 100644 .github/actions/setup-etcd/action.yml

diff --git a/.github/actions/setup-etcd/action.yml b/.github/actions/setup-etcd/action.yml
deleted file mode 100644
index 0941de158..000000000
--- a/.github/actions/setup-etcd/action.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: 'Setup etcd'
-description: 'Download and extract etcd release archive'
-inputs:
-  etcd-version:
-    description: 'Release name from https://github.com/etcd-io/etcd/releases'
-    required: true
-    default: v3.4.13
-  install-prefix:
-    description: 'Where to extract the archive'
-    default: './etcd'
-runs:
-  using: 'composite'
-  steps:
-    - shell: bash
-      env:
-        BASE_URL: "https://github.com/etcd-io/etcd/releases/download"
-        ETCD_VER: ${{ inputs.etcd-version }}
-        INSTALL_PREFIX: ${{ inputs.install-prefix }}
-      run: >
-        set -x;
-        mkdir -p ${INSTALL_PREFIX}
-
-        curl -L ${BASE_URL}/${ETCD_VER}/etcd-${ETCD_VER}-linux-amd64.tar.gz |
-        tar xz --strip-components=1 -C ${INSTALL_PREFIX}
-        etcd-${ETCD_VER}-linux-amd64/etcdctl
-        etcd-${ETCD_VER}-linux-amd64/etcd
-
-    - shell: bash
-      env:
-        INSTALL_PREFIX: ${{ inputs.install-prefix }}
-      run: |
-        set -x
-        ${INSTALL_PREFIX}/etcd --version
-        ${INSTALL_PREFIX}/etcdctl version
diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml
index ae144bbda..691f85197 100644
--- a/.github/workflows/backend-test.yml
+++ b/.github/workflows/backend-test.yml
@@ -112,12 +112,10 @@ jobs:
           curl -L https://tarantool.io/pre-release/2/installer.sh | bash
           sudo apt-get -y install tarantool
 
-      # Setup etcd
-      - name: Install etcd
-        uses: ./.github/actions/setup-etcd
-        if: runner.os == 'Linux'
+      - name: Set up etcd
+        uses: tarantool/actions/setup-etcd@master
         with:
-          etcd-version: '${{ matrix.etcd }}'
+          version: '${{ matrix.etcd }}'
           install-prefix: etcd-${{ matrix.etcd }}
 
       - run: echo "ETCD_PATH=etcd-${{ matrix.etcd }}/etcd" >> $GITHUB_ENV
@@ -214,12 +212,10 @@ jobs:
           echo "${SDK_PATH}" >> ${GITHUB_PATH}
           echo "TARANTOOL_SDK_PATH=${SDK_PATH}" >> ${GITHUB_ENV}
 
-      # Setup etcd
-      - name: Install etcd
-        uses: ./.github/actions/setup-etcd
-        if: runner.os == 'Linux'
+      - name: Set up etcd
+        uses: tarantool/actions/setup-etcd@master
         with:
-          etcd-version: '${{ matrix.etcd }}'
+          version: '${{ matrix.etcd }}'
           install-prefix: etcd-${{ matrix.etcd }}
 
       - run: echo "ETCD_PATH=etcd-${{ matrix.etcd }}/etcd" >> $GITHUB_ENV
diff --git a/.github/workflows/nightly-test.yml b/.github/workflows/nightly-test.yml
index da6841c25..1facac312 100644
--- a/.github/workflows/nightly-test.yml
+++ b/.github/workflows/nightly-test.yml
@@ -25,12 +25,10 @@ jobs:
           tarantool-version: '${{ matrix.tarantool }}'
           nightly-build: true
 
-      # Setup etcd
-      - name: Install etcd
-        uses: ./.github/actions/setup-etcd
-        if: runner.os == 'Linux'
+      - name: Set up etcd
+        uses: tarantool/actions/setup-etcd@master
         with:
-          etcd-version: v2.3.8
+          version: v2.3.8
           install-prefix: etcd-v2.3.8
 
       # Setup luatest
diff --git a/.github/workflows/reusable-backend-test.yml b/.github/workflows/reusable-backend-test.yml
index 7bb0eaf85..ca3e927f5 100644
--- a/.github/workflows/reusable-backend-test.yml
+++ b/.github/workflows/reusable-backend-test.yml
@@ -34,11 +34,10 @@ jobs:
         # dependencies are already there.
         run: sudo dpkg -i tarantool*.deb
 
-      # Setup etcd
-      - name: 'Install etcd'
-        uses: ./.github/actions/setup-etcd
+      - name: Set up etcd
+        uses: tarantool/actions/setup-etcd@master
         with:
-          etcd-version: v2.3.8
+          version: v2.3.8
           install-prefix: etcd-v2.3.8
 
       # Setup luatest