diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e7d80a74..5b5190f1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,20 +10,17 @@ on: type: string env: - OAREPO_VERSION: ${{ github.event.inputs.oarepo }} + OAREPO_VERSION: ${{ inputs.oarepo }} jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - python-version: [ "3.9", "3.10" ] steps: - uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} + - name: Set up Python uses: actions/setup-python@v3 with: - python-version: ${{ matrix.python-version }} + python-version: "3.10" - name: Cache pip uses: actions/cache@v3 with: diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index fad9a87e..54317498 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -7,14 +7,19 @@ permissions: contents: read jobs: - build: + build11: uses: ./.github/workflows/build.yaml with: oarepo: 11 + build12: + uses: ./.github/workflows/build.yaml + with: + oarepo: 12 + publish: runs-on: ubuntu-latest - needs: build + needs: build11 steps: - name: Use built artifacts uses: actions/download-artifact@v3 diff --git a/run-tests.sh b/run-tests.sh index c6ceb040..d93dfb88 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -11,7 +11,6 @@ export TEST_VENV=.venv-tests export SERVER_VENV=.venv-server OAREPO_VERSION=${OAREPO_VERSION:-11} -OAREPO_VERSION_MAX=$((OAREPO_VERSION+1)) initialize_server_venv() { @@ -24,7 +23,7 @@ initialize_server_venv() { source $SERVER_VENV/bin/activate $SERVER_VENV/bin/pip install -U setuptools pip wheel - $SERVER_VENV/bin/pip install "oarepo>=$OAREPO_VERSION,<$OAREPO_VERSION_MAX" + $SERVER_VENV/bin/pip install "oarepo[tests]==${OAREPO_VERSION}.*" $SERVER_VENV/bin/pip install -e complex-model $SERVER_VENV/bin/pip install -U pytest }