Skip to content

Commit dad134a

Browse files
gsaluja9gsaluja9
authored
Merge pull request #234 from aperture-data/release-0.4.4
Multiple fixes: 1) Better categorization of responses. 2) Unpinning of majority of dependencies. 3) Performance improvements for Rest connector
2 parents 16d3e6d + 548b664 commit dad134a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1350
-736
lines changed

‎.github/workflows/checks.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,25 @@ name: syntax-check
33
on:
44
pull_request:
55
push:
6-
branches: [develop, main]
6+
branches:
7+
- develop
8+
- main
79

810
jobs:
911
pre-commit:
12+
1013
runs-on: ubuntu-latest
14+
1115
steps:
16+
1217
- uses: actions/checkout@v2
18+
1319
- uses: actions/setup-python@v3
1420
with:
1521
python-version: '3.10'
22+
1623
- uses: pre-commit/[email protected]
24+
1725
- uses: actions/checkout@v2
26+
1827
- uses: luisremis/find-trailing-whitespace@master

‎.github/workflows/develop.yml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
name: develop
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
build-test:
10+
11+
runs-on:
12+
- self-hosted
13+
- deployer
14+
15+
steps:
16+
17+
- uses: actions/checkout@v2
18+
19+
- name: Login to DockerHub
20+
uses: docker/login-action@v1
21+
with:
22+
username: ${{ secrets.DOCKER_USER }}
23+
password: ${{ secrets.DOCKER_PASS }}
24+
25+
- name: Login to Google Cloud
26+
uses: google-github-actions/setup-gcloud@v0
27+
with:
28+
service_account_key: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
29+
project_id: ${{ secrets.GCP_SERVICE_ACCOUNT_PROJECT_ID }}
30+
export_default_credentials: true
31+
32+
- name: Build and Run Tests
33+
env:
34+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
35+
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
36+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
37+
GCP_SERVICE_ACCOUNT_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
38+
run: 'EXCLUDE_DOCUMENTATION=1 EXCLUDE_DEPLOY=1 ./ci.sh'
39+
shell: bash
40+
41+
build_and_deploy_docs:
42+
needs:
43+
- build-test
44+
45+
runs-on:
46+
- self-hosted
47+
- deployer
48+
49+
steps:
50+
51+
- uses: actions/checkout@v2
52+
53+
- name: Login to DockerHub
54+
uses: docker/login-action@v1
55+
with:
56+
username: ${{ secrets.DOCKER_USER }}
57+
password: ${{ secrets.DOCKER_PASS }}
58+
59+
- name: Build Notebook,docs Docker
60+
env:
61+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
62+
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
63+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
64+
run: |
65+
EXCLUDE_TESTING=1 EXCLUDE_DEPLOY=1 ./ci.sh
66+
shell: bash
67+
68+
deploy_web_services:
69+
needs:
70+
- build-test
71+
- build_and_deploy_docs
72+
73+
runs-on: ubuntu-latest
74+
75+
steps:
76+
77+
- uses: actions/checkout@v2
78+
79+
- name: Login to DockerHub
80+
uses: docker/login-action@v1
81+
with:
82+
username: ${{ secrets.DOCKER_USER }}
83+
password: ${{ secrets.DOCKER_PASS }}
84+
85+
- name: Apply Terraform
86+
env:
87+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
88+
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
89+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
90+
run: |
91+
EXCLUDE_TESTING=1 EXCLUDE_DOCUMENTATION=1 ./ci.sh
92+
shell: bash

‎.github/workflows/main.yml‎

Lines changed: 91 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,108 @@
1-
# This is a basic workflow to run tests on commit/PRs on develop
2-
31
name: main
42

5-
# Controls when the action will run.
63
on:
7-
# Triggers the workflow on push or pull request events
8-
# but only for the develop, master, and release branches
94
push:
105
branches:
116
- main
127

13-
# Allows you to run this workflow manually from the Actions tab
14-
workflow_dispatch:
15-
16-
# A workflow run is made up of one or more jobs
17-
# that can run sequentially or in parallel
188
jobs:
19-
# This workflow contains a single job called "build-test"
209
build-test:
21-
# The type of runner that the job will run on Ubuntu 18.04 (latest)
22-
runs-on: self-hosted
2310

24-
# Steps represent a sequence of tasks that will be
25-
# executed as part of the job
11+
runs-on:
12+
- self-hosted
13+
- deployer
14+
2615
steps:
27-
# Checks-out your repository under $GITHUB_WORKSPACE,
28-
# so your job can access it
29-
- uses: actions/checkout@v2
30-
31-
- name: Login to DockerHub
32-
uses: docker/login-action@v1
33-
with:
34-
username: ${{ secrets.DOCKER_USER }}
35-
password: ${{ secrets.DOCKER_PASS }}
36-
37-
- name: Login to Google Cloud
38-
uses: google-github-actions/setup-gcloud@v0
39-
with:
40-
service_account_key: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
41-
project_id: ${{ secrets.GCP_SERVICE_ACCOUNT_PROJECT_ID }}
42-
export_default_credentials: true
43-
44-
- name: Build tests
45-
run: 'EXCLUDE_DOCUMENTATION=1 ./ci.sh'
46-
shell: bash
47-
48-
49-
- name: Run Tests
50-
env:
51-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
52-
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
53-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
54-
GCP_SERVICE_ACCOUNT_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
55-
run: |
56-
cd test
57-
./run_test_container.sh
16+
17+
- uses: actions/checkout@v2
18+
19+
- name: Login to DockerHub
20+
uses: docker/login-action@v1
21+
with:
22+
username: ${{ secrets.DOCKER_USER }}
23+
password: ${{ secrets.DOCKER_PASS }}
24+
25+
- name: Login to Google Cloud
26+
uses: google-github-actions/setup-gcloud@v0
27+
with:
28+
service_account_key: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
29+
project_id: ${{ secrets.GCP_SERVICE_ACCOUNT_PROJECT_ID }}
30+
export_default_credentials: true
31+
32+
- name: Build and Run Tests
33+
env:
34+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
35+
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
36+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
37+
GCP_SERVICE_ACCOUNT_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
38+
run: 'EXCLUDE_DOCUMENTATION=1 EXCLUDE_DEPLOY=1 ./ci.sh'
39+
shell: bash
5840

5941
build_and_deploy_docs:
6042
needs:
61-
- build-test
43+
- build-test
44+
45+
runs-on:
46+
- self-hosted
47+
- deployer
48+
49+
steps:
50+
51+
- uses: actions/checkout@v2
52+
53+
- name: Login to DockerHub
54+
uses: docker/login-action@v1
55+
with:
56+
username: ${{ secrets.DOCKER_USER }}
57+
password: ${{ secrets.DOCKER_PASS }}
58+
59+
- name: Build Notebook,docs Docker
60+
env:
61+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
62+
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
63+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
64+
run: |
65+
EXCLUDE_TESTING=1 EXCLUDE_DEPLOY=1 ./ci.sh
66+
shell: bash
67+
68+
- name: Publish to PyPi
69+
env:
70+
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
71+
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
72+
run: |
73+
pip3 install twine
74+
bash publish.sh
75+
76+
- name: Tag release version
77+
run: './tag.sh'
78+
shell: bash
79+
80+
- name: GitHub Release
81+
run: 'TOKEN=${{ secrets.GITHUBPAT }} ./github-release.sh'
82+
shell: bash
83+
84+
deploy_web_services:
85+
needs:
86+
- build-test
87+
- build_and_deploy_docs
6288

63-
# The type of runner that the job will run on Ubuntu 18.04 (latest)
64-
runs-on: self-hosted
89+
runs-on: ubuntu-latest
6590

66-
# Steps represent a sequence of tasks that will be
67-
# executed as part of the job
6891
steps:
69-
# Checks-out your repository under $GITHUB_WORKSPACE,
70-
# so your job can access it
71-
- uses: actions/checkout@v3
72-
with:
73-
fetch-depth: 0
74-
ref: ${{ github.event.pull_request.head.ref }}
75-
76-
- name: Login to DockerHub
77-
uses: docker/login-action@v1
78-
with:
79-
username: ${{ secrets.DOCKER_USER }}
80-
password: ${{ secrets.DOCKER_PASS }}
81-
82-
- name: Build Notebook,docs Docker
83-
env:
84-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
85-
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
86-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
87-
run: |
88-
EXCLUDE_TESTING=1 ./ci.sh
89-
shell: bash
90-
91-
- name: Publish to PyPi
92-
env:
93-
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
94-
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
95-
run: |
96-
pip3 install twine
97-
bash publish.sh
98-
99-
- name: Tag release version
100-
run: './tag.sh'
101-
shell: bash
102-
103-
- name: GitHub Release
104-
run: 'TOKEN=${{ secrets.GITHUBPAT }} ./github-release.sh'
105-
shell: bash
92+
93+
- uses: actions/checkout@v2
94+
95+
- name: Login to DockerHub
96+
uses: docker/login-action@v1
97+
with:
98+
username: ${{ secrets.DOCKER_USER }}
99+
password: ${{ secrets.DOCKER_PASS }}
100+
101+
- name: Apply Terraform
102+
env:
103+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
104+
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
105+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
106+
run: |
107+
EXCLUDE_TESTING=1 EXCLUDE_DOCUMENTATION=1 ./ci.sh
108+
shell: bash

0 commit comments

Comments
 (0)