Skip to content

Commit

Permalink
RDM 12 tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mesemus committed Dec 18, 2023
1 parent 65664f5 commit 31f7daa
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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
}
Expand Down

0 comments on commit 31f7daa

Please sign in to comment.