Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/js/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ runs:

- name: 'Setup JS'
shell: bash
run: make setup-js
run: make setup-js-ci
2 changes: 1 addition & 1 deletion .github/workflows/g-code-testing-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
run: |
npm config set cache ${{ github.workspace }}/.npm-cache
yarn config set cache-folder ${{ github.workspace }}/.yarn-cache
make setup-js
make setup-js-ci
- name: Lint
run: make -C g-code-testing lint
- name: Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/react-api-client-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
run: |
npm config set cache ./.npm-cache
yarn config set cache-folder ./.yarn-cache
make setup-js
make setup-js-ci
- name: 'run api-client and react-api-client unit tests'
run: make -C api-client test-cov
- name: 'Upload coverage report'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/shared-data-test-lint-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jobs:
run: |
npm config set cache ./.npm-cache
yarn config set cache-folder ./.yarn-cache
make setup-js
make setup-js-ci
- name: 'run shared-data JS unit tests'
run: make -C shared-data test-cov
- name: 'Upload coverage report'
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
elif [ "${{ format('{0}', startsWith(github.ref, 'refs/tags/components')) }}" = "true" ] ; then
echo "Publishing builds for components@ tags"
echo 'should_publish=true' >> $GITHUB_OUTPUT
else
else
echo "No publish for ref ${{github.ref}} and event ${{github.event_type}}"
echo 'should_publish=false' >> $GITHUB_OUTPUT
fi
Expand Down Expand Up @@ -250,7 +250,7 @@ jobs:
run: |
npm config set cache ./.npm-cache
yarn config set cache-folder ./.yarn-cache
make setup-js
make setup-js-ci
- name: 'build typescript'
run: make build-ts
- name: 'build library'
Expand Down
11 changes: 10 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@ setup-js:
$(MAKE) -C $(APP_SHELL_DIR) setup
$(MAKE) -C $(APP_SHELL_ODD_DIR) setup

# front-end dependencies install for CI
.PHONY: setup-js-ci
setup-js-ci:
yarn config set network-timeout 60000
yarn install --frozen-lockfile
$(MAKE) -C $(APP_SHELL_DIR) setup
$(MAKE) -C $(APP_SHELL_ODD_DIR) setup


PYTHON_SETUP_TARGETS := $(addsuffix -py-setup, $(PYTHON_DIRS))

.PHONY: setup-py
Expand Down Expand Up @@ -314,7 +323,7 @@ test-js-internal:
yarn vitest $(tests) $(test_opts) $(cov_opts)

.PHONY: test-js-%
test-js-%:
test-js-%:
$(MAKE) test-js-internal tests="$(if $(tests),$(foreach test,$(tests),$*/$(test)),$*)" test_opts="$(test_opts)" cov_opts="$(cov_opts)"

.PHONY: validate-codecov-yml
Expand Down
Loading