Use common etcd action instead of local (#2196)

tarantool · Mar 15, 2024 · 01e0d20 · 01e0d20
1 parent 9143edf
commit 01e0d20
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 53 deletions.
diff --git a/.github/actions/setup-etcd/action.yml b/.github/actions/setup-etcd/action.yml
diff --git 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
@@ -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
@@ -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