Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Isolate test dependencies and update docs #105

Merged
merged 10 commits into from
Nov 3, 2023
Merged

Isolate test dependencies and update docs #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5e5125a
Update documentation on how to build the project
nberth Nov 2, 2023
1fc496b
Extract `superbol_testutils` package, and gather test dependencies
nberth Oct 31, 2023
a9bf2ef
Rename dummy package `superbol_testutils` into `superbol-testdeps`
nberth Nov 2, 2023
3993748
Remove outdated/redundant `opam/superbol-vscode-extension.opam`
nberth Nov 2, 2023
801757d
Make `drom` take back control of `.github/workflows/workflow.yml`
nberth Nov 2, 2023
cfe3625
Fix opam files for cross-compilation
nberth Nov 2, 2023
3a7584c
Update instructions for building the project
nberth Nov 2, 2023
60ac3aa
Remove outdated/redundant `opam/package-json.opam`
nberth Nov 2, 2023
293e603
Fix typo in README.md
nberth Nov 2, 2023
f503a69
Mention precise `drom` version
nberth Nov 2, 2023
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
117 changes: 44 additions & 73 deletions .drom
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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