git.delta.rocks / jrsonnet / refs/commits / 86c2530b0f69

--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 
 .idea
 .vscode
+
+cache

1variables:
2  CARGO_HOME: $CI_PROJECT_DIR/cache
3
4stages:
5  - prepare
6  - build
7
8build-container:
1image: "rustlang/rust:nightly"9  image: docker:19.03.11
10  stage: prepare
11  services:
12    - docker:19.03.11-dind
13  before_script:
14    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
15  script:
16    - docker build -t $CI_REGISTRY_IMAGE:build .
17    - docker push $CI_REGISTRY_IMAGE:build
218
3test:cargo:19test-library:
20  image: $CI_REGISTRY_IMAGE:build
21  stage: build
4  script:22  script:
5    - rustc --version && cargo --version23    - make test
24  cache:
25    key: test
26    paths:
6    - cargo test --all --verbose27      - ./cache
28
29build-linux:
30  image: $CI_REGISTRY_IMAGE:build
31  stage: build
32  script:
33    - make build-native
34  cache:
35    key: linux
36    paths:
37      - ./cache
38      - ./target
39  artifacts:
40    paths:
41      - ./target/release/jrsonnet
42    expire_in: 30 days
43
44build-wasm:
45  image: $CI_REGISTRY_IMAGE:build
46  stage: build
47  script:
48    - make build-wasi
49  cache:
50    key: wasm
51    paths:
52      - ./cache
53      - ./target
54  artifacts:
55    paths:
56      - ./target/wasm32-wasi/release/jsonnet.wasm
57    expire_in: 30 days
758

--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,7 @@
-jsonnet-cpp:
-	git clone https://github.com/google/jsonnet jsonnet-cpp
-
-.ONESHELL:
-test-examples: jsonnet-cpp
-	cargo build --release
-	export JSONNET_BIN="$(PWD)/target/release/jsonnet"
-	export EXAMPLES_DIR="$(PWD)/jsonnet-cpp/examples/"
-	cd ./jsonnet-cpp/examples/
-	./check.sh
+.PHONY: test build build-wasi
+test:
+	cargo test
+build:
+	RUSTFLAGS="-Zmutable-noalias=yes -C link-arg=-s" cargo build --release -p jrsonnet
+build-wasi:
+	cd ./bindings/ && cargo build --release -p jsonnet --target wasm32-wasi