From 8745fd05b0fcff48a1923854183fd6a4516f6e6b Mon Sep 17 00:00:00 2001
From: Daniel Weipert <code@drogueronin.de>
Date: Mon, 29 May 2023 12:49:41 +0200
Subject: gitlab-ci

---
 .gitlab-ci.yml    |  5 ++---
 gitlab-ci.nix     | 35 -----------------------------------
 nix/gitlab-ci.nix | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 38 deletions(-)
 delete mode 100644 gitlab-ci.nix
 create mode 100644 nix/gitlab-ci.nix

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 597eb1d..e5ac6f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,9 +10,8 @@ build:
     - export NIX_PATH=nixpkgs=channel:nixos-unstable
 
   script:
-    - nix-env -f shell.nix -i -A buildInputs
-    - python ./nix/android-shell-shellHook.py ${ANDROID_HOME}/build-tools ${ANDROID_HOME}/platforms
-    - make build
+    - nix-shell --command "make build"
+    - "echo $(ls)"
 
   artifacts:
     paths:
diff --git a/gitlab-ci.nix b/gitlab-ci.nix
deleted file mode 100644
index 4fbba37..0000000
--- a/gitlab-ci.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-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/nix/gitlab-ci.nix b/nix/gitlab-ci.nix
new file mode 100644
index 0000000..4fbba37
--- /dev/null
+++ b/nix/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
+  '';
+}
-- 
cgit v1.2.3