Skip to content

Commit

Permalink
Merge pull request #1 from oarepo/rdm12
Browse files Browse the repository at this point in the history
rdm12
  • Loading branch information
Alzpeta authored Jul 1, 2024
2 parents 9caad08 + 0890786 commit 25e2211
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ on:
workflow_call:
inputs:
oarepo:
description: OARepo version (11, 12, ...)
description: OARepo version (12, ...)
required: true
default: 11
default: 12
type: string

env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manual.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ on:
workflow_dispatch:
inputs:
oarepo:
description: OARepo version (11, 12, ...)
description: OARepo version (12, ...)
required: true
default: 11
default: 12

jobs:
build:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,14 @@ permissions:
contents: read

jobs:
build11:
uses: ./.github/workflows/build.yaml
with:
oarepo: 11

build12:
uses: ./.github/workflows/build.yaml
with:
oarepo: 12

publish:
runs-on: ubuntu-latest
needs: build11
needs: build12
steps:
- name: Use built artifacts
uses: actions/download-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

OAREPO_VERSION=${OAREPO_VERSION:-11}
OAREPO_VERSION=${OAREPO_VERSION:-12}

BUILDER_VENV=".venv-builder"
if test -d $BUILDER_VENV ; then
Expand Down

0 comments on commit 25e2211

Please sign in to comment.