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.

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

Fix issue with build using flake system in issue #747 #754

Merged
merged 3 commits into from
Mar 18, 2024
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
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ jobs:
- uses: cachix/install-nix-action@v22
with:
nix_path: nixpkgs=channel:nixos-unstable
- name: Check each yarn.nix up to date
run: |
cd client && nix-shell -p yarn2nix --run "yarn2nix > new_yarn.nix" && diff new_yarn.nix yarn.nix
cd goal-view-ui && nix-shell -p yarn2nix --run "yarn2nix > new_yarn.nix" && diff new_yarn.nix yarn.nix
cd ../search-ui && nix-shell -p yarn2nix --run "yarn2nix > new_yarn.nix" && diff new_yarn.nix yarn.nix
- run: nix develop .#vscoq-language-server-${{ matrix.coq }} -c bash -c "cd language-server && dune build"
- run: nix develop .#vscoq-client -c bash -c "cd client && yarn run install:all && yarn run build:all && yarn run compile"
- run: xvfb-run nix develop .#vscoq-client -c bash -c "cd client && yarn test"
Expand Down Expand Up @@ -199,10 +204,14 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 16.x
- name: Publish on VsCode marketplace
- name: Copy licences
run: |
cd client
cp ../LICENSE . && cp ../README.md .
- name: Pre publish phase
run: |
cd client
yarn run package
- name: Publish to Open VSX Registry
uses: HaaLeo/[email protected]
id: publishToOpenVSX
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/publish-extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 16.x
- name: Publish on VsCode marketplace
- name: Copy licences
run: |
cd client
cp ../LICENSE . && cp ../README.md .
- name: Pre publish phase
run: |
cd client
yarn run package
- name: Publish to Open VSX Registry
uses: HaaLeo/[email protected]
id: publishToOpenVSX
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ language-server/_build
client/yarn-error.log
client/.vscode-test/
client/out/
.DS_Store
result
1,085 changes: 1,085 additions & 0 deletions client/goal-view-ui/yarn.nix

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,6 @@
"start:search-ui": "cd search-ui && yarn run start",
"build:search-ui": "cd search-ui && yarn run build",
"build:dev:search-ui": "cd search-ui && yarn run build:dev",
"vscode:prepublish": "yarn run package",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this causes the publish-extension CI job to fail. Maybe we can just add a yarn run package step to the CI, before the relevant job ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks again for you contribution :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can just add a yarn run package step to the CI

Yeah, that's kind of what I was envisioning. Seems like that's the only reason CI failed

"compile": "webpack",
"watch": "webpack --watch",
"package": "yarn run install:all && yarn run build:all && webpack --mode production --devtool hidden-source-map",
Expand Down
1,109 changes: 1,109 additions & 0 deletions client/search-ui/yarn.nix

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export function activate(context: ExtensionContext) {
const vscoq1 = extensions.getExtension("coq-community.vscoq1");
if (vscoq1) {
if (vscoq1.isActive) {
const message = "VsCoq2 is incompatible with VsCoq1 it is recommended that you disable one of them.";
const message = "VsCoq2 is incompatible with VsCoq1. it is recommended that you disable one of them.";
window.showErrorMessage(message, { title: "Disable VsCoq1", id: 0 }, { title: "Disable VsCoq2", id: 1 })
.then(act => {
if (act?.id === 0) {
Expand Down
Loading
Loading