Skip to content

Commit fcd5d0f

Browse files
committed
1 parent ee06faa commit fcd5d0f

File tree

12 files changed

+546
-1355
lines changed

12 files changed

+546
-1355
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
./plugin/.spago
3333
./conformance/.spago
3434
35-
- name: Install dependencies
35+
- name: Install Plugin dependencies
3636
run: |
3737
protoc --version
3838
echo -n "node "
@@ -42,6 +42,7 @@ jobs:
4242
echo -n "spago "
4343
spago --version
4444
echo ""
45+
cd plugin
4546
spago install
4647
4748
- name: Build Plugin
@@ -52,7 +53,7 @@ jobs:
5253
- name: Test Plugin
5354
# Need --experimental_allow_proto3_optional until the CI protoc is upgraded
5455
run: |
55-
protoc --experimental_allow_proto3_optional --plugin=bin/protoc-gen-purescript --purescript_out=./plugin/test/Test/generated --proto_path ./plugin/test ./plugin/test/*.proto
56+
protoc --experimental_allow_proto3_optional --plugin=bin/protoc-gen-purescript --purescript_out=./plugin/test/Test/generated --proto_path=./plugin/test ./plugin/test/*.proto
5657
cd plugin
5758
spago test
5859

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"purescript.buildCommand": "spago build --json-errors",
2+
"purescript.autoStartPscIde": true
33
}

README.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# purescript-protobuf 💝
1+
# purescript-protobuf
22

33
[![Pursuit](http://pursuit.purescript.org/packages/purescript-protobuf/badge)](http://pursuit.purescript.org/packages/purescript-protobuf/)
44
[![Maintainer: jamesdbrock](https://img.shields.io/badge/maintainer-jamesdbrock-teal.svg)](https://github.com/jamesdbrock)
@@ -364,6 +364,17 @@ nix run github:xc-jp/purescript-protobuf#conformance
364364
365365
Pull requests welcome.
366366
367+
This repo is organized as a
368+
[Spago polyrepo](https://github.com/purescript/spago#polyrepo-support).
369+
370+
- `purescript-protobuf`
371+
- [`library`](library) — `protobuf` package, published to Pursuit
372+
- [`spago.yaml`](library/spago.yaml)
373+
- [`plugin`](plugin) — protoc plugin app for code generation
374+
- [`spago.yaml`](plugin/spago.yaml)
375+
- [`conformance`](conformance) — Google Protobuf Conformance test runner app
376+
- [`spago.yaml`](conformance/spago.yaml)
377+
367378
## Other References
368379
369380
* [__justifill__](https://pursuit.purescript.org/packages/purescript-justifill) package may be useful for message construction.

conformance/spago.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"workspace": {
33
"packages": {
4-
"conformance-purescript": {
4+
"conformance": {
55
"path": "./",
66
"core": {
77
"dependencies": [
@@ -1276,6 +1276,7 @@
12761276
"control",
12771277
"effect",
12781278
"either",
1279+
"enums",
12791280
"exceptions",
12801281
"float32",
12811282
"foldable-traversable",

conformance/spago.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package:
2-
name: conformance-purescript
2+
name: conformance
33
dependencies:
44
- protobuf
55
- aff
@@ -14,4 +14,4 @@ workspace:
1414
registry: 60.5.1
1515
extraPackages:
1616
protobuf:
17-
path: ../library
17+
path: ../library

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
shellHook = ''
119119
source <(spago --bash-completion-script `which spago`)
120120
source <(node --completion-bash)
121-
export PURS_IDE_SOURCES=$(spago sources --package protobuf)
121+
export PURS_IDE_SOURCES=$(spago sources;cd plugin;spago sources)
122122
echo "PureScript Protobuf development environment"
123123
protoc --version
124124
echo -n "node "

0 commit comments

Comments
 (0)