Skip to content

Commit 93885f4

Browse files
authored
Merge pull request #430 from OP-TED/feature/TED-1192
disable on pull request github action
2 parents cffad67 + af59b9d commit 93885f4

2 files changed

Lines changed: 38 additions & 29 deletions

File tree

.github/workflows/unit-tests-srv.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@ name: Tests on srv server
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [ feature/* , main, hotfix/* ]
7-
pull_request:
8-
branches: [ main, release/* ]
6+
branches: [ feature/* , main, hotfix/*, release/* ]
7+
# pull_request:
8+
# branches: [ main, release/* ]
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
12+
cancel-in-progress: true
13+
914
env:
1015
VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }}
1116
VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
@@ -30,11 +35,11 @@ jobs:
3035
- name: Get RML mapper
3136
run: make init-rml-mapper
3237

33-
# - name: Get Allure
34-
# run: make install-allure
38+
# - name: Get Allure
39+
# run: make install-allure
3540

36-
# - name: Start staging infra
37-
# run: make start-project-services
41+
# - name: Start staging infra
42+
# run: make start-project-services
3843

3944
- name: Run tests
4045
run: make test-all

.github/workflows/unit-tests.yml

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,39 @@ name: Tests
22

33
on:
44
push:
5-
branches: [ feature/* , main, hotfix/* ]
6-
pull_request:
7-
branches: [ main, release/* ]
5+
branches: [ feature/* , main, hotfix/*, release/* ]
6+
# pull_request:
7+
# branches: [ main, release/* ]
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
11+
cancel-in-progress: true
812

913
jobs:
1014
build:
1115
name: pyTest
1216
runs-on: ubuntu-latest
1317

1418
steps:
15-
- uses: actions/checkout@v2
16-
with:
17-
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
18-
- name: Set up Python ${{ matrix.python-version }}
19-
uses: actions/setup-python@v2
20-
with:
21-
python-version: 3.8
22-
- name: Install dependencies
23-
run: |
24-
python -m pip install --upgrade setuptools pip wheel
25-
make install
26-
make install-dev
27-
- name: Make envfile
28-
uses: SpicyPizza/create-envfile@v1
29-
with:
30-
envkey_VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }}
31-
envkey_VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
32-
- name: Run unit tests
33-
run: make test
19+
- uses: actions/checkout@v2
20+
with:
21+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
22+
- name: Set up Python ${{ matrix.python-version }}
23+
uses: actions/setup-python@v2
24+
with:
25+
python-version: 3.8
26+
- name: Install dependencies
27+
run: |
28+
python -m pip install --upgrade setuptools pip wheel
29+
make install
30+
make install-dev
31+
- name: Make envfile
32+
uses: SpicyPizza/create-envfile@v1
33+
with:
34+
envkey_VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }}
35+
envkey_VAULT_ADDR: ${{ secrets.VAULT_ADDR }}
36+
- name: Run unit tests
37+
run: make test
3438
# - name: Upload coverage to Codecov
3539
# uses: codecov/codecov-action@v1
3640
# with:

0 commit comments

Comments
 (0)