Skip to content

Commit 57c83c7

Browse files
puehringerpuehringer
authored
Merge pull request #42 from datavisyn/revert-39-new_deployment_no_ports
Revert "New deployment no ports"
2 parents 9a9155d + eb113ca commit 57c83c7

18 files changed

+51
-87
lines changed

‎.github/actions/build-node/action.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ inputs:
2929
run_webpack:
3030
default: false
3131
required: false
32-
disable_cache:
33-
description: "Set to true to disable caching"
34-
default: false
35-
required: false
3632

3733
runs:
3834
using: "composite"
@@ -63,7 +59,6 @@ runs:
6359
name: node-yarn-lock
6460
# Enable yarn download cache, @see https://github.com/actions/cache/tree/main/save#always-save-cache and https://github.com/actions/setup-node/issues/325
6561
- name: Restore yarn cache
66-
if: inputs.disable_cache == 'false'
6762
uses: actions/cache/restore@v3
6863
with:
6964
# This path is the global yarn cache, because for some reason the local .yarn/cache is not used. Maybe we need to set the cacheFolder, enableGlobalCache, ... options differently? @see https://yarnpkg.com/configuration/yarnrc#cacheFolder
@@ -76,8 +71,8 @@ runs:
7671
run: yarn install --no-immutable --inline-builds
7772
shell: bash
7873
- name: Save yarn cache
79-
if: inputs.disable_cache == 'false' && steps.install.outcome == 'success'
8074
uses: actions/cache/save@v3
75+
if: steps.install.outcome == 'success'
8176
with:
8277
# This path is the global yarn cache, because for some reason the local .yarn/cache is not used. Maybe we need to set the cacheFolder, enableGlobalCache, ... options differently? @see https://yarnpkg.com/configuration/yarnrc#cacheFolder
8378
path: ~/.yarn/berry/cache/

‎.github/actions/build-python/action.yml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,16 @@ inputs:
2020
run_build:
2121
default: true
2222
required: false
23-
disable_cache:
24-
description: "Set to true to disable caching"
25-
default: false
26-
required: false
2723

2824
runs:
2925
using: "composite"
3026
steps:
31-
- name: Set up python (with cache)
32-
if: inputs.disable_cache == 'false'
27+
- name: Set up python
3328
uses: actions/setup-python@v3
3429
with:
3530
python-version: ${{ inputs.python_version }}
3631
cache: 'pip'
3732
# needs wheel for make
38-
- name: Set up python (without cache)
39-
if: inputs.disable_cache == 'true'
40-
uses: actions/setup-python@v3
41-
with:
42-
python-version: ${{ inputs.python_version }}
4333
- name: install additional requirements
4434
run: |
4535
pip install setuptools wheel

‎.github/workflows/build-node-python.yml‎

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@ on:
5757
type: string
5858
required: false
5959
default: "ubuntu-22.04-large"
60-
#disable_cache:
61-
# description: "Set to true to disable caching"
62-
# required: false
63-
# type: boolean
64-
# default: false
6560
secrets:
6661
DATAVISYN_BOT_REPO_TOKEN:
6762
required: false
@@ -80,8 +75,7 @@ env:
8075
PYPI_REGISTRY: "https://upload.pypi.org/legacy/"
8176
PYPI_USERNAME: "datavisyn"
8277
PYTHON_VERSION: "3.10"
83-
WORKFLOW_BRANCH: "new_deployment_no_ports"
84-
POSTGRES_HOSTNAME: postgres_${{ inputs.branch }}_${{ github.run_id }}
78+
WORKFLOW_BRANCH: "new_deployment"
8579

8680
permissions:
8781
contents: read
@@ -100,12 +94,12 @@ jobs:
10094
runs-on: ${{ inputs.runs_on }}
10195
steps:
10296
- name: Checkout source repository
103-
uses: actions/checkout@v4
97+
uses: actions/checkout@v3
10498
with:
10599
ref: ${{ inputs.branch }}
106100
token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}
107101
- name: Checkout github-workflows
108-
uses: actions/checkout@v4
102+
uses: actions/checkout@v3
109103
with:
110104
repository: datavisyn/github-workflows
111105
ref: ${{ env.WORKFLOW_BRANCH }}
@@ -117,7 +111,6 @@ jobs:
117111
npm_registry: ${{ env.NPM_REGISTRY }}
118112
github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}
119113
run_webpack: ${{ inputs.node_run_webpack }}
120-
#disable_cache: ${{ inputs.disable_cache }}
121114

122115
build-python:
123116
name: Python
@@ -128,12 +121,12 @@ jobs:
128121
runs-on: ${{ inputs.runs_on }}
129122
steps:
130123
- name: Checkout source repository
131-
uses: actions/checkout@v4
124+
uses: actions/checkout@v3
132125
with:
133126
ref: ${{ inputs.branch }}
134127
token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}
135128
- name: Checkout github-workflows
136-
uses: actions/checkout@v4
129+
uses: actions/checkout@v3
137130
with:
138131
repository: datavisyn/github-workflows
139132
ref: ${{ env.WORKFLOW_BRANCH }}
@@ -143,7 +136,7 @@ jobs:
143136
with:
144137
python_version: ${{ secrets.PYTHON_VERSION || env.PYTHON_VERSION }}
145138
github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}
146-
#disable_cache: ${{ inputs.disable_cache }}
139+
147140
# If cypress is used, build node and python sequentially as it is avoiding the duplicate install overhead
148141
build-node-python-cypress:
149142
name: Node, Python, Cypress
@@ -168,21 +161,17 @@ jobs:
168161
--health-interval 10s
169162
--health-timeout 5s
170163
--health-retries 5
171-
--name postgres_${{ inputs.branch }}_${{ github.run_id }}
164+
ports:
165+
- 5432:5432
172166

173167
steps:
174-
- name: Set system env variable to github env
175-
run: echo "GH_ACTIONS_SELF_HOSTED_NETWORK_NAME=${GH_ACTIONS_SELF_HOSTED_NETWORK_NAME}" >> "$GITHUB_ENV"
176-
- name: Connect service to default network
177-
if: env.GH_ACTIONS_SELF_HOSTED_NETWORK_NAME != ''
178-
run: docker network connect ${{ env.GH_ACTIONS_SELF_HOSTED_NETWORK_NAME }} ${{ env.POSTGRES_HOSTNAME }}
179168
- name: Checkout source repository
180-
uses: actions/checkout@v4
169+
uses: actions/checkout@v3
181170
with:
182171
ref: ${{ inputs.branch }}
183172
token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}
184173
- name: Checkout github-workflows
185-
uses: actions/checkout@v4
174+
uses: actions/checkout@v3
186175
with:
187176
repository: datavisyn/github-workflows
188177
ref: ${{ env.WORKFLOW_BRANCH }}
@@ -194,13 +183,11 @@ jobs:
194183
npm_registry: ${{ env.NPM_REGISTRY }}
195184
github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}
196185
run_webpack: false # Disable the build here and call afterwards, as otherwise the yarn run env:decrypt will fail due to a missing yarn install
197-
#disable_cache: ${{ inputs.disable_cache }}
198186
- name: Build python
199187
uses: ./tmp/github-workflows/.github/actions/build-python
200188
with:
201189
python_version: ${{ secrets.PYTHON_VERSION || env.PYTHON_VERSION }}
202190
github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}
203-
#disable_cache: ${{ inputs.disable_cache }}
204191
- name: Decrypt .env.enc and <app>/.env.enc
205192
run: |
206193
yarn run env:decrypt -pass env:ENV_PASSWORD || true
@@ -223,8 +210,6 @@ jobs:
223210
make start
224211
wait-on: "http://localhost:8080, http://localhost:9000/health"
225212
env: ${{ secrets.CYPRESS_ENV }}
226-
env:
227-
POSTGRES_HOSTNAME: ${{ env.POSTGRES_HOSTNAME }}
228213
- name: Run cypress component tests
229214
uses: cypress-io/github-action@v6
230215
with:
@@ -272,21 +257,17 @@ jobs:
272257
--health-interval 10s
273258
--health-timeout 5s
274259
--health-retries 5
275-
--name postgres_${{ inputs.branch }}_${{ github.run_id }}
260+
ports:
261+
- 5432:5432
276262

277263
steps:
278-
- name: Set system env variable to github env
279-
run: echo "GH_ACTIONS_SELF_HOSTED_NETWORK_NAME=${GH_ACTIONS_SELF_HOSTED_NETWORK_NAME}" >> "$GITHUB_ENV"
280-
- name: Connect service to default network
281-
if: env.GH_ACTIONS_SELF_HOSTED_NETWORK_NAME != ''
282-
run: docker network connect ${{ env.GH_ACTIONS_SELF_HOSTED_NETWORK_NAME }} ${{ env.POSTGRES_HOSTNAME }}
283264
- name: Checkout source repository
284-
uses: actions/checkout@v4
265+
uses: actions/checkout@v3
285266
with:
286267
ref: ${{ inputs.branch }}
287268
token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}
288269
- name: Checkout github-workflows
289-
uses: actions/checkout@v4
270+
uses: actions/checkout@v3
290271
with:
291272
repository: datavisyn/github-workflows
292273
ref: ${{ env.WORKFLOW_BRANCH }}
@@ -298,13 +279,11 @@ jobs:
298279
npm_registry: ${{ env.NPM_REGISTRY }}
299280
github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}
300281
run_webpack: false # Disable the build here and call afterwards, as otherwise the yarn run env:decrypt will fail due to a missing yarn install
301-
#disable_cache: ${{ inputs.disable_cache }}
302282
- name: Build python
303283
uses: ./tmp/github-workflows/.github/actions/build-python
304284
with:
305285
python_version: ${{ secrets.PYTHON_VERSION || env.PYTHON_VERSION }}
306286
github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}
307-
#disable_cache: ${{ inputs.disable_cache }}
308287
- name: Decrypt .env.enc and <app>/.env.enc
309288
run: |
310289
yarn run env:decrypt -pass env:ENV_PASSWORD || true

‎.github/workflows/build-node.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ jobs:
3737
runs-on: ubuntu-22.04
3838
steps:
3939
# checkout specific source repository
40-
- uses: actions/checkout@v4
40+
- uses: actions/checkout@v3
4141
with:
4242
ref: ${{ inputs.branch }}
4343
token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }} # has to set because otherwise it will not work
4444
# checkout this workflow repository to get actions
45-
- uses: actions/checkout@v4
45+
- uses: actions/checkout@v3
4646
with:
4747
repository: datavisyn/github-workflows
4848
ref: ${{ env.WORKFLOW_BRANCH }}

‎.github/workflows/build-product.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ jobs:
5757
runs-on: ubuntu-22.04
5858
steps:
5959
# checkout specific repository
60-
- uses: actions/checkout@v4
60+
- uses: actions/checkout@v3
6161
# checkout this workflow repository to get actions
62-
- uses: actions/checkout@v4
62+
- uses: actions/checkout@v3
6363
with:
6464
repository: datavisyn/github-workflows
6565
ref: ${{ env.WORKFLOW_BRANCH }}
@@ -118,7 +118,7 @@ jobs:
118118
if: ${{ always() && (needs.build-single.result == 'success' || needs.build-single.result == 'skipped') && (needs.build-workspace.result == 'success' || needs.build-workspace.result == 'skipped') && !(needs.build-workspace.result == 'skipped' && needs.build-single.result == 'skipped')}}
119119
runs-on: ubuntu-22.04
120120
steps:
121-
- uses: actions/checkout@v4
121+
- uses: actions/checkout@v3
122122
with:
123123
repository: datavisyn/github-workflows
124124
ref: ${{ env.WORKFLOW_BRANCH }}

‎.github/workflows/build-push-docker.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
runs-on: ubuntu-22.04
3939
steps:
4040
# checkout specific source repository
41-
- uses: actions/checkout@v4
41+
- uses: actions/checkout@v3
4242
# checkout this workflow repository to get actions
43-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v3
4444
with:
4545
repository: datavisyn/github-workflows
4646
ref: ${{ env.WORKFLOW_BRANCH }}

‎.github/workflows/build-push-helm-chart.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
runs-on: ubuntu-22.04
3737
steps:
3838
# checkout specific source repository
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v3
4040
# checkout this workflow repository to get actions
41-
- uses: actions/checkout@v4
41+
- uses: actions/checkout@v3
4242
with:
4343
repository: datavisyn/github-workflows
4444
ref: ${{ env.WORKFLOW_BRANCH }}

‎.github/workflows/build-python.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ jobs:
3737
runs-on: ubuntu-22.04
3838
steps:
3939
# checkout specific source repository
40-
- uses: actions/checkout@v4
40+
- uses: actions/checkout@v3
4141
with:
4242
ref: ${{ inputs.branch }}
4343
# checkout this workflow repository to get actions
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v3
4545
with:
4646
repository: datavisyn/github-workflows
4747
ref: ${{ env.WORKFLOW_BRANCH }}

‎.github/workflows/build-single-product-part.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ jobs:
5959
runs-on: ubuntu-22.04
6060
steps:
6161
# checkout specific repository
62-
- uses: actions/checkout@v4
62+
- uses: actions/checkout@v3
6363
with:
6464
token: ${{ secrets.CHECKOUT_TOKEN || github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}
6565
# checkout this workflow repository to get actions
66-
- uses: actions/checkout@v4
66+
- uses: actions/checkout@v3
6767
with:
6868
repository: datavisyn/github-workflows
6969
ref: ${{ env.WORKFLOW_BRANCH }}

‎.github/workflows/build-workspace-product-part.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ jobs:
5757
runs-on: ubuntu-22.04
5858
steps:
5959
# checkout specific repository
60-
- uses: actions/checkout@v4
60+
- uses: actions/checkout@v3
6161
with:
6262
token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}
6363
# checkout this workflow repository to get actions
64-
- uses: actions/checkout@v4
64+
- uses: actions/checkout@v3
6565
with:
6666
repository: datavisyn/github-workflows
6767
ref: ${{ env.WORKFLOW_BRANCH }}

0 commit comments

Comments
 (0)