gitlab-ci

3 files changed, 36 insertions, 6 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94c0ce0..d126680 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,12 +7,9 @@ build:
 
   before_script:
     - export NIX_PATH=nixpkgs=channel:nixos-unstable
-    - nix-shell
 
   script:
-    # - make build
-    - 'echo $(which make)'
-    - bazel build //app/java:dnsproxy
+    - nix-shell --command="make build"
 
   artifacts:
     paths:
diff --git a/gitlab-ci.nix b/gitlab-ci.nix
new file mode 100644
index 0000000..12a176b
--- /dev/null
+++ b/gitlab-ci.nix
@@ -0,0 +1,35 @@
+with (import <nixpkgs> {});
+let
+  jdk = jdk11;
+  android-composition = import ./nix/android-composition.nix;
+in
+stdenv.mkDerivation rec {
+  name = "gitlab-ci";
+
+	buildInputs = [
+    python3Full
+    gnumake
+    jdk
+    android-composition.androidsdk
+    bazel_4
+	];
+
+  src = ./.;
+
+  JAVA_HOME = jdk.home;
+  ANDROID_SDK_ROOT = "${android-composition.androidsdk}/libexec/android-sdk";
+  ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle";
+  ANDROID_HOME = "${ANDROID_SDK_ROOT}";
+
+  preferLocalBuild = true;
+  dontUnpack = true;
+  buildPhase = ''
+    # TODO: replace with nix builtins
+    # python ./android-shell-shellHook.py ${ANDROID_HOME}/build-tools ${ANDROID_HOME}/platforms
+
+    make build -C $src
+  '';
+  installPhase = ''
+    mv $src/bazel-bin/app/java/dnsproxy.apk $out
+  '';
+}
diff --git a/shell.nix b/shell.nix
index c298e4e..d457038 100644
--- a/shell.nix
+++ b/shell.nix
@@ -22,7 +22,5 @@ mkShell rec {
   shellHook = ''
     # TODO: replace with nix builtins
     python ./nix/android-shell-shellHook.py ${ANDROID_HOME}/build-tools ${ANDROID_HOME}/platforms
-    echo $(which bazel)
-    echo $(which make)
   '';
 }