Skip to content

Commit

Permalink
Merge pull request #430 from OP-TED/feature/TED-1192
Browse files Browse the repository at this point in the history
disable on pull request github action
  • Loading branch information
costezki authored Jan 24, 2023
2 parents cffad67 + af59b9d commit 93885f4
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 29 deletions.
19 changes: 12 additions & 7 deletions .github/workflows/unit-tests-srv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@ name: Tests on srv server
on:
workflow_dispatch:
push:
branches: [ feature/* , main, hotfix/* ]
pull_request:
branches: [ main, release/* ]
branches: [ feature/* , main, hotfix/*, release/* ]
# pull_request:
# branches: [ main, release/* ]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }}
VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
Expand All @@ -30,11 +35,11 @@ jobs:
- name: Get RML mapper
run: make init-rml-mapper

# - name: Get Allure
# run: make install-allure
# - name: Get Allure
# run: make install-allure

# - name: Start staging infra
# run: make start-project-services
# - name: Start staging infra
# run: make start-project-services

- name: Run tests
run: make test-all
Expand Down
48 changes: 26 additions & 22 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,39 @@ name: Tests

on:
push:
branches: [ feature/* , main, hotfix/* ]
pull_request:
branches: [ main, release/* ]
branches: [ feature/* , main, hotfix/*, release/* ]
# pull_request:
# branches: [ main, release/* ]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
name: pyTest
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install dependencies
run: |
python -m pip install --upgrade setuptools pip wheel
make install
make install-dev
- name: Make envfile
uses: SpicyPizza/create-envfile@v1
with:
envkey_VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }}
envkey_VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
- name: Run unit tests
run: make test
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install dependencies
run: |
python -m pip install --upgrade setuptools pip wheel
make install
make install-dev
- name: Make envfile
uses: SpicyPizza/create-envfile@v1
with:
envkey_VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }}
envkey_VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
- name: Run unit tests
run: make test
# - name: Upload coverage to Codecov
# uses: codecov/codecov-action@v1
# with:
Expand Down

0 comments on commit 93885f4

Please sign in to comment.