Skip to content

Commit d3066cd

Browse files
authored
Merge pull request #35 from DataFog/temp-update-cicd
Temp update cicd
2 parents ce18eec + 4228dd9 commit d3066cd

File tree

3 files changed

+54
-50
lines changed

3 files changed

+54
-50
lines changed

.github/workflows/dev-cicd.yml

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,56 +8,58 @@ on:
88
branches:
99
- dev
1010

11+
1112
jobs:
1213
lint:
1314
runs-on: ubuntu-latest
1415
steps:
1516
- name: Check out repo
16-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
18+
- name: Set up Python
19+
uses: actions/setup-python@v4
20+
with:
21+
python-version: "3.10"
22+
- name: Install pre-commit
23+
run: pip install pre-commit
1724
- name: Run pre-commit
18-
uses: pre-commit/action@v3.0.1
25+
run: pre-commit run --all-files
1926

20-
build-and-test:
27+
build:
2128
runs-on: ubuntu-latest
2229
strategy:
2330
matrix:
2431
python-version: ["3.10"]
2532
steps:
26-
- uses: actions/setup-python@v4
33+
- name: Check out repo
34+
uses: actions/checkout@v4
35+
- name: Set up Python
36+
uses: actions/setup-python@v4
2737
with:
2838
python-version: ${{ matrix.python-version }}
29-
- uses: actions/checkout@v3
30-
3139
- name: Install Tesseract OCR
3240
run: |
3341
sudo apt-get update
3442
sudo apt-get install -y software-properties-common
3543
sudo add-apt-repository -y ppa:alex-p/tesseract-ocr-devel
3644
sudo apt-get update
37-
sudo apt-get install -y tesseract-ocr
38-
sudo apt-get install -y libtesseract-dev
45+
sudo apt-get install -y tesseract-ocr libtesseract-dev
3946
tesseract --version
4047
dpkg -l | grep tesseract
41-
4248
- name: Verify Tesseract Installation
4349
run: |
4450
which tesseract
4551
tesseract --list-langs
46-
47-
- name: Update PATH
48-
run: echo "export PATH=$PATH:/usr/bin" >> $GITHUB_ENV
49-
50-
- name: Install dependencies and run tests
52+
- name: Install Dependencies
5153
run: |
52-
pip install tox
53-
tox -- --cov datafog --cov-report xml --cov-report term
54-
55-
- name: Submit to codecov
54+
pip install -U pip
55+
pip install -e .
56+
pip install tox just pre-commit
57+
- name: Run Tests with tox
58+
run: tox -- --cov datafog --cov-report xml --cov-report term --codeblocks
59+
- name: Submit to Codecov
5660
uses: codecov/codecov-action@v3
57-
if: ${{ matrix.python-version == '3.10' }}
58-
59-
- name: Upload coverage reports to Codecov
60-
uses: codecov/codecov-action@v4.0.1
61-
env:
61+
with:
6262
token: ${{ secrets.CODECOV_TOKEN }}
63-
slug: DataFog/datafog-python
63+
files: ./coverage.xml
64+
flags: unittests
65+
name: codecov-umbrella

.github/workflows/feature-cicd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Check out repo
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
- name: Set up Python
1818
uses: actions/setup-python@v4
1919
with:
@@ -30,7 +30,7 @@ jobs:
3030
python-version: ["3.10"]
3131
steps:
3232
- name: Check out repo
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434
- name: Set up Python
3535
uses: actions/setup-python@v4
3636
with:

.github/workflows/main-cicd.yml

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: main-cicd-tests
1+
name: main-cicd-setup-and-test
22

33
on:
44
push:
@@ -8,56 +8,58 @@ on:
88
branches:
99
- main
1010

11+
1112
jobs:
1213
lint:
1314
runs-on: ubuntu-latest
1415
steps:
1516
- name: Check out repo
16-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
18+
- name: Set up Python
19+
uses: actions/setup-python@v4
20+
with:
21+
python-version: "3.10"
22+
- name: Install pre-commit
23+
run: pip install pre-commit
1724
- name: Run pre-commit
18-
uses: pre-commit/action@v3.0.0
25+
run: pre-commit run --all-files
1926

2027
build:
2128
runs-on: ubuntu-latest
2229
strategy:
2330
matrix:
2431
python-version: ["3.10"]
2532
steps:
26-
- uses: actions/setup-python@v4
33+
- name: Check out repo
34+
uses: actions/checkout@v4
35+
- name: Set up Python
36+
uses: actions/setup-python@v4
2737
with:
2838
python-version: ${{ matrix.python-version }}
29-
30-
- uses: actions/checkout@v3
3139
- name: Install Tesseract OCR
3240
run: |
3341
sudo apt-get update
3442
sudo apt-get install -y software-properties-common
3543
sudo add-apt-repository -y ppa:alex-p/tesseract-ocr-devel
3644
sudo apt-get update
37-
sudo apt-get install -y tesseract-ocr
38-
sudo apt-get install -y libtesseract-dev
45+
sudo apt-get install -y tesseract-ocr libtesseract-dev
3946
tesseract --version
4047
dpkg -l | grep tesseract
41-
4248
- name: Verify Tesseract Installation
4349
run: |
4450
which tesseract
4551
tesseract --list-langs
46-
47-
- name: Update PATH
48-
run: echo "export PATH=$PATH:/usr/bin" >> $GITHUB_ENV
49-
50-
- name: Install dependencies and run tests
52+
- name: Install Dependencies
5153
run: |
52-
pip install tox
53-
tox -- --cov datafog --cov-report xml --cov-report term
54-
55-
- name: Submit to codecov
54+
pip install -U pip
55+
pip install -e .
56+
pip install tox just pre-commit
57+
- name: Run Tests with tox
58+
run: tox -- --cov datafog --cov-report xml --cov-report term --codeblocks
59+
- name: Submit to Codecov
5660
uses: codecov/codecov-action@v3
57-
if: ${{ matrix.python-version == '3.10' }}
58-
59-
- name: Upload coverage reports to Codecov
60-
uses: codecov/codecov-action@v4.0.1
61-
env:
61+
with:
6262
token: ${{ secrets.CODECOV_TOKEN }}
63-
slug: DataFog/datafog-python
63+
files: ./coverage.xml
64+
flags: unittests
65+
name: codecov-umbrella

0 commit comments

Comments
 (0)