From e7d2f3591b874a728e91480169d87d08a9081fe3 Mon Sep 17 00:00:00 2001 From: Oleg Babin Date: Tue, 30 Apr 2024 11:00:47 +0300 Subject: [PATCH] ci: bump versions of stuff that is used in actions --- .github/workflows/asan_testing.yml | 28 ++++++++++++++-------------- .github/workflows/fast_testing.yml | 30 +++++++++++++++--------------- .github/workflows/publish.yml | 12 ++++++------ tests/requirements.txt | 8 ++++---- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/workflows/asan_testing.yml b/.github/workflows/asan_testing.yml index cf21e97..676d0c6 100644 --- a/.github/workflows/asan_testing.yml +++ b/.github/workflows/asan_testing.yml @@ -2,36 +2,36 @@ name: asan_testing on: push: + branches: + - master pull_request: - workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true jobs: linux: - # We want to run on external PRs, but not on our own internal - # PRs as they'll be run by the push to the branch. - # - # The main trick is described here: - # https://github.com/Dart-Code/Dart-Code/pull/2375 - if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository - runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v3 - with: - python-version: '3.10' - - name: Clone the module - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true + - uses: actions/setup-python@v5 + with: + python-version: '3.10' + cache: 'pip' + cache-dependency-path: 'tests/requirements.txt' + - name: Start Kafka uses: ybyzek/cp-all-in-one-action@v0.2.1 with: type: cp-all-in-one-community - name: Install Python dependencies - run: pip3 install -r tests/requirements.txt + run: pip install -r tests/requirements.txt - name: Build module run: | diff --git a/.github/workflows/fast_testing.yml b/.github/workflows/fast_testing.yml index 81bdb3e..ff9d4f2 100644 --- a/.github/workflows/fast_testing.yml +++ b/.github/workflows/fast_testing.yml @@ -2,23 +2,21 @@ name: fast_testing on: push: + branches: + - master pull_request: - workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true jobs: linux: - # We want to run on external PRs, but not on our own internal - # PRs as they'll be run by the push to the branch. - # - # The main trick is described here: - # https://github.com/Dart-Code/Dart-Code/pull/2375 - if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository - strategy: fail-fast: false matrix: tarantool: - - '2.10' + - '2.11' runs-on: ubuntu-latest steps: @@ -27,22 +25,24 @@ jobs: with: tarantool-version: ${{ matrix.tarantool }} - - uses: actions/setup-python@v3 - with: - python-version: '3.10' - - name: Clone the module - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true + - uses: actions/setup-python@v5 + with: + python-version: '3.10' + cache: 'pip' + cache-dependency-path: 'tests/requirements.txt' + - name: Start Kafka uses: ybyzek/cp-all-in-one-action@v0.2.1 with: type: cp-all-in-one-community - name: Install Python dependencies - run: pip3 install -r tests/requirements.txt + run: pip install -r tests/requirements.txt - name: Build module run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c3544a4..6ec630b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,7 +9,7 @@ jobs: version-check: # We need this job to run only on push with tag. if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Check module version uses: tarantool/actions/check-module-version@master @@ -19,9 +19,9 @@ jobs: publish-scm-1: if: github.ref == 'refs/heads/master' - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: tarantool/rocks.tarantool.org/github-action@master with: auth: ${{ secrets.ROCKS_AUTH }} @@ -30,12 +30,12 @@ jobs: publish-tag: if: startsWith(github.ref, 'refs/tags/') needs: version-check - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: tarantool/setup-tarantool@v1 with: - tarantool-version: '2.10' + tarantool-version: '2.11' # Make a release - run: echo TAG=${GITHUB_REF##*/} >> $GITHUB_ENV - run: tarantoolctl rocks new_version --tag ${{ env.TAG }} diff --git a/tests/requirements.txt b/tests/requirements.txt index ae8d28e..a5f96dc 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,5 +1,5 @@ -pytest==7.3.1 -pytest-timeout==2.1.0 +pytest==8.2.0 +pytest-timeout==2.3.1 kafka-python==2.0.2 -aiokafka==0.8.0 -tarantool==1.0.0 +aiokafka==0.10.0 +tarantool==1.2.0