diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml index 9404cc560..aefe0c654 100644 --- a/.github/workflows/backend-test.yml +++ b/.github/workflows/backend-test.yml @@ -39,7 +39,7 @@ jobs: if: steps.cache-misc-venv.outputs.cache-hit != 'true' # Setup tarantool - - uses: rosik/setup-tarantool@v1 + - uses: tarantool/setup-tarantool@v1 with: tarantool-version: '1.10' @@ -91,7 +91,7 @@ jobs: runs-on: ${{ matrix.runs-on }} steps: - uses: actions/checkout@v2 - - uses: rosik/setup-tarantool@v1 + - uses: tarantool/setup-tarantool@v1 with: tarantool-version: '${{ matrix.tarantool }}' diff --git a/.github/workflows/frontend-test.yml b/.github/workflows/frontend-test.yml index efd5c2ccc..26b8dc492 100644 --- a/.github/workflows/frontend-test.yml +++ b/.github/workflows/frontend-test.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 - - uses: rosik/setup-tarantool@v1 + - uses: tarantool/setup-tarantool@v1 with: tarantool-version: '1.10' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 761a44006..f4c472cf4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,45 +3,47 @@ name: Publish on: push: branches: [master] - tags: - -env: - ROCKS_USERNAME: ${{ secrets.ROCKS_USERNAME }} - ROCKS_PASSWORD: ${{ secrets.ROCKS_PASSWORD }} - CMAKE_LDOC_FIND_REQUIRED: 'YES' - CMAKE_SPHINX_FIND_REQUIRED: 'YES' + tags: ['*'] jobs: - scm-1: - runs-on: ubuntu-latest + publish-scm-1: if: github.ref == 'refs/heads/master' + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - name: Upload rockspec - run: ./upload.sh cartridge-scm-1.rockspec + - uses: tarantool/rocks.tarantool.org/github-action@master + with: + auth: ${{ secrets.ROCKS_AUTH }} + files: cartridge-scm-1.rockspec - release: - runs-on: ubuntu-latest + publish-tag: if: startsWith(github.ref, 'refs/tags/') + runs-on: ubuntu-20.04 + env: + CMAKE_LDOC_FIND_REQUIRED: 'YES' + CMAKE_SPHINX_FIND_REQUIRED: 'YES' steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 - uses: actions/setup-python@v2 - run: python -m pip install -r rst/requirements.txt - - name: Install tarantool - run: | - curl -L https://tarantool.io/installer.sh | sudo VER=1.10 bash - sudo apt install -y tarantool tarantool-dev + - uses: tarantool/setup-tarantool@v1 + with: + tarantool-version: '2.5' + - run: tarantoolctl rocks install ldoc + --server=https://tarantool.github.io/LDoc/ + - run: echo $PWD/.rocks/bin >> $GITHUB_PATH - - name: Install ldoc - run: > - tarantoolctl rocks install --server=http://rocks.moonscript.org - https://raw.githubusercontent.com/tarantool/ldoc/tarantool/ldoc-scm-2.rockspec + # Make a release + - run: echo TAG=${GITHUB_REF##*/} >> $GITHUB_ENV + - run: tarantoolctl rocks new_version --tag ${{ env.TAG }} + - run: tarantoolctl rocks install cartridge-${{ env.TAG }}-1.rockspec + - run: tarantoolctl rocks pack cartridge ${{ env.TAG }} - - name: Upload rockspec - run: | - TAG=${GITHUB_REF##*/} - ./release.sh $TAG - ./upload.sh release/membership-${TAG}-1.rockspec - ./upload.sh release/membership-${TAG}-1.all.rock + - uses: tarantool/rocks.tarantool.org/github-action@master + with: + auth: ${{ secrets.ROCKS_AUTH }} + files: | + cartridge-${{ env.TAG }}-1.rockspec + cartridge-${{ env.TAG }}-1.all.rock diff --git a/release.sh b/release.sh deleted file mode 100755 index 2410ce913..000000000 --- a/release.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -set -e - -if [ -n "$1" ] -then - TAG="$1" -else - TAG=$(git describe --exact-match HEAD 2>/dev/null || true) -fi - -if [ -z "$TAG" ] -then - echo "No git tag found. Skipping release." - exit 1 -fi - -echo "Preparing release \"$TAG\"" -mkdir -p release -sed -e "s/branch = '.\+'/tag = '$TAG'/g" \ - -e "s/version = '.\+'/version = '$TAG-1'/g" \ - cartridge-scm-1.rockspec > release/cartridge-$TAG-1.rockspec - -tarantoolctl rocks make release/cartridge-$TAG-1.rockspec -tarantoolctl rocks pack cartridge $TAG && mv cartridge-$TAG-1.all.rock release/ - -mkdir -p release-doc -cp -RT doc/ release-doc/cartridge-$TAG-1 diff --git a/upload.sh b/upload.sh deleted file mode 100755 index 1528c2218..000000000 --- a/upload.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -URL=https://rocks.tarantool.org -echo "Uploading $1 to $URL" -exec curl --fail -X PUT -F "rockspec=@$1" \ - -u "${ROCKS_USERNAME}:${ROCKS_PASSWORD}" $URL