diff options
| -rw-r--r-- | .gitlab-ci.yml | 17 | ||||
| -rw-r--r-- | nix/gitlab-ci.nix | 35 |
2 files changed, 1 insertions, 51 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9532f0e..45b3044 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,19 +14,4 @@ build: artifacts: paths: - - "/bazel-bin/app/java/dnsproxy.apk" - -deploy: - stage: deploy - only: - # - tags - - gitlab-ci - - needs: - - job: build - artifacts: true - - image: curlimages/curl:latest - - script: - - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file bazel-bin/app/java/dnsproxy.apk "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/apk/${CI_COMMIT_TAG}/dnsproxy.apk"' + - "bazel-bin/app/java/dnsproxy.apk" diff --git a/nix/gitlab-ci.nix b/nix/gitlab-ci.nix deleted file mode 100644 index 4fbba37..0000000 --- a/nix/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 - ''; -} |