Skip to content

Commit

Permalink
fix: revert "feat: Download Flux modules within runtime as part of Sa…
Browse files Browse the repository at this point in the history
…lsa query (#5324)" (#5342)

* fix: revert "feat: Download Flux modules within runtime as part of Salsa query (#5324)"

This reverts commit cced93e.
The commit broke nightlies.

* fix: revert "feat(libflux): associate registry attributes to import statements (#5332)"

This reverts commit 77b1d78.

* fix: revert "refactor: Remove flux_analyze (#5335)"

This reverts commit 1db3400.
  • Loading branch information
nathanielc committed Nov 14, 2022
1 parent cced93e commit b9d6eb6
Show file tree
Hide file tree
Showing 39 changed files with 402 additions and 2,138 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@ jobs:
go install github.com/influxdata/pkg-config
- run:
name: Generate libflux
command: RUSTUP_TOOLCHAIN=1.63-x86_64-pc-windows-gnu go generate ./libflux/go/libflux
command: go generate ./libflux/go/libflux
- run:
name: Build flux
no_output_timeout: 20m
command: RUSTUP_TOOLCHAIN=1.63-x86_64-pc-windows-gnu go build ./...
command: go build ./...

release:
docker:
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -161,19 +161,19 @@ libflux-go: $(LIBFLUX_GENERATED_TARGETS)
$(GO_GENERATE) ./libflux/go/libflux

libflux-wasm:
cd libflux/flux && CC=clang AR=llvm-ar wasm-pack build --scope influxdata --dev --no-default-features
cd libflux/flux && CC=clang AR=llvm-ar wasm-pack build --scope influxdata --dev

clean-wasm:
rm -rf libflux/flux/pkg

build-wasm:
cd libflux/flux && CC=clang AR=llvm-ar wasm-pack build -t nodejs --scope influxdata --no-default-features
cd libflux/flux && CC=clang AR=llvm-ar wasm-pack build -t nodejs --scope influxdata

publish-wasm: clean-wasm build-wasm
cd libflux/flux/pkg && npm publish --access public

test-wasm: clean-wasm build-wasm
cd libflux/flux && CC=clang AR==llvm-ar wasm-pack test --node --no-default-features
cd libflux/flux && CC=clang AR==llvm-ar wasm-pack test --node

test-valgrind: libflux
cd libflux/c && $(MAKE) test-valgrind
Expand Down
3 changes: 1 addition & 2 deletions internal/fbsemantic/semantic.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,7 @@ table PackageClause {
table ImportDeclaration {
loc:SourceLocation;
alias:Identifier;
registry:string;
path:string;
path:StringLiteral;
}

table SourceLocation {
Expand Down
24 changes: 9 additions & 15 deletions internal/fbsemantic/semantic_generated.go

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

2 changes: 1 addition & 1 deletion interpreter/interpreter.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ func GetOption(ctx context.Context, pkg string, option string) (values.Value, bo
}

func (itrp *Interpreter) doImport(ctx context.Context, dec *semantic.ImportDeclaration, scope values.Scope, importer Importer) error {
path := dec.Path
path := dec.Path.Value
pkg, err := importer.ImportPackageObject(path)
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion interpreter/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func TestAccessNestedImport(t *testing.T) {
},
Imports: []*semantic.ImportDeclaration{
{
Path: "b",
Path: &semantic.StringLiteral{Value: "b"},
},
},
Body: []semantic.Statement{
Expand Down

0 comments on commit b9d6eb6

Please sign in to comment.