Skip to content

Commit

Permalink
fix line change, add cypress_spec, remove pg_ready check
Browse files Browse the repository at this point in the history
  • Loading branch information
dvviktordelev committed May 8, 2024
1 parent c98b079 commit e6a6ebb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ runs:
run: yarn install --no-immutable --inline-builds
shell: bash
- name: Save yarn cache
if: steps.install.outcome == 'success'
uses: actions/cache/save@v3
if: steps.install.outcome == 'success'
with:
# 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
path: ~/.yarn/berry/cache/
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/build-node-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ jobs:
with:
python_version: ${{ secrets.PYTHON_VERSION || env.PYTHON_VERSION }}
github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }}

# If cypress is used, build node and python sequentially as it is avoiding the duplicate install overhead
build-node-python-cypress:
name: Node, Python, Cypress
Expand Down Expand Up @@ -252,13 +253,10 @@ jobs:
install: false
# TODO: Create customizable variables for these?
start: |
pg_isready -d db -h ${{ env.POSTGRES_HOSTNAME }} -p ${{ env.POSTGRES_PORT }} -U admin
yarn start dev_server_only=true
make start
wait-on: "http://localhost:8080, http://localhost:9000/health"
#env: ${{ secrets.CYPRESS_ENV }}
#env: postgres_hostname=${{ env.POSTGRES_HOSTNAME }},postgres_port=${{ env.POSTGRES_PORT }}
#pg_isready -d db -h ${{ env.POSTGRES_HOSTNAME }} -p ${{ env.POSTGRES_PORT }} -U admin
spec: ${{ inputs.cypress_spec_param }}
env:
POSTGRES_HOSTNAME: ${{ env.POSTGRES_HOSTNAME }}
POSTGRES_PORT: ${{ env.POSTGRES_PORT }}
Expand Down

0 comments on commit e6a6ebb

Please sign in to comment.