Skip to content

Commit

Permalink
Merge pull request #105 from nberth/update-build-docs
Browse files Browse the repository at this point in the history
Isolate test dependencies and update docs
  • Loading branch information
nberth authored Nov 3, 2023
2 parents 6027e91 + f503a69 commit 15572bf
Show file tree
Hide file tree
Showing 107 changed files with 1,179 additions and 1,409 deletions.
117 changes: 44 additions & 73 deletions .drom

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
id: cache-opam
with:
path: ~/.opam
key: v2-${{ runner.os }}-superbol-vscode-platform-${{ matrix.ocaml-compiler }}-${{ hashFiles('opam/*.opam') }}
key: v2-${{ runner.os }}-superbol-studio-oss-${{ matrix.ocaml-compiler }}-${{ hashFiles('opam/*.opam') }}
# restore-keys: |
# v2-${{ runner.os }}-opam-${{ matrix.ocaml-compiler }}-

Expand All @@ -61,7 +61,7 @@ jobs:

- run: opam pin add . -y --no-action

- run: opam depext -y superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib superbol_project cobol_common cobol_parser cobol_ptree ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_indent cobol_preproc cobol_data cobol_typeck superbol_testutils ez_toml ezr_toml
- run: opam depext -y superbol-studio-oss superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib superbol_project cobol_common cobol_parser cobol_ptree ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_indent cobol_preproc cobol_data cobol_typeck ez_toml ezr_toml
# if: steps.cache-opam.outputs.cache-hit != 'true'

- run: opam install -y opam/*.opam --deps-only --with-test
Expand All @@ -84,6 +84,9 @@ jobs:
- run: make build

# Use fields.github-workflow-after-build to add something here
- name: install test dependencies
if: matrix.skip_test != 'true'
run: opam install -y test/opam/*.opam --deps-only --with-test

- name: run test suite
run: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/superbol-studio-oss
/superbol-vscode-platform
/polka-js-stubs
/interop-js-stubs
Expand Down
5 changes: 3 additions & 2 deletions Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Makefile.drom-tpl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# -*- Makefile -*-
# Generated by "drom project"
.PHONY: all build build-deps fmt fmt-check install dev-deps test
.PHONY: clean distclean
Expand Down Expand Up @@ -69,7 +70,7 @@ uninstall:
opam uninstall .

dev-deps:
opam install ./opam/*.opam --deps-only --with-doc --with-test
opam install ./opam/*.opam ./test/opam/*.opam --deps-only --with-doc --with-test

test:
./scripts/before.sh test
Expand Down
Loading

0 comments on commit 15572bf

Please sign in to comment.