-
Notifications
You must be signed in to change notification settings - Fork 74
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
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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" | ||
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,3 +5,5 @@ language-server/_build | |
client/yarn-error.log | ||
client/.vscode-test/ | ||
client/out/ | ||
.DS_Store | ||
result |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 ?There was a problem hiding this comment.
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 :-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, that's kind of what I was envisioning. Seems like that's the only reason CI failed