Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 55955f34 authored by Akhil's avatar Akhil 🙂
Browse files

Correct gitlab ci

parent 78753290

.gitlab-ci.yml

+0 −44
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ default: 
  tags:

    - generic_privileged



<<<<<<< HEAD

.build-docker:

=======

build-branch:

  stage: build

  variables:
@@ -34,50 +31,10 @@ build-branch: 
    - if: $CI_COMMIT_REF_SLUG != null

      when: on_success

  allow_failure: true

>>>>>>> f25afbd (Add selfhost CI/CD and selfhost Dockerfile steps)

  script:

    - echo "TARGET $TARGET, BRANCH $CI_COMMIT_BRANCH, COMMIT_REF_SLUG $CI_COMMIT_REF_SLUG, COMMIT_TAG $CI_COMMIT_TAG"

    - docker build --target $TARGET  --pull -t "$CI_REGISTRY_IMAGE$SUBPATH:$CI_COMMIT_REF_SLUG" .

    - docker push "$CI_REGISTRY_IMAGE$SUBPATH:$CI_COMMIT_REF_SLUG"

<<<<<<< HEAD



build-branch:

  stage: build

  variables:

    TARGET: ecloud

    SUBPATH: ''

  only:

    - branches

  extends: .build-docker



build-branch-selfhost:

  stage: build

  variables:

    TARGET: selfhost

    SUBPATH: '/selfhost'

  only:

    - branches

  when: manual

  extends: .build-docker



build-tag:

  stage: build

  variables:

    TARGET: ecloud

    SUBPATH: ''

  only:

    - tags

  extends: .build-docker



build-tag-selfhost:

  stage: build

  variables:

    TARGET: selfhost

    SUBPATH: '/selfhost'

  only:

    - tags

  extends: .build-docker

=======



build-tag:

  stage: build
@@ -110,4 +67,3 @@ docker-tag: 
    - docker pull $CI_REGISTRY_IMAGE:$SOURCE

    - docker tag $CI_REGISTRY_IMAGE:$SOURCE $CI_REGISTRY_IMAGE:$TARGET

    - docker push $CI_REGISTRY_IMAGE:$TARGET
 
>>>>>>> f25afbd (Add selfhost CI/CD and selfhost Dockerfile steps)