diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1cd8b9c469b903b815c4aa5a7977b1ff49897edd..034634c03dd7f6121505206c0c4c0b8a0a5bdb10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,6 @@ amd64: tags: - amd64 script: -<<<<<<< HEAD - docker build --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg CI_JOB_TOKEN=$CI_JOB_TOKEN --pull -t $IMAGE -f Dockerfile . - docker push $IMAGE - docker tag $IMAGE $IMAGE_SHA @@ -55,16 +54,3 @@ manifest: - docker manifest push $IMAGE - docker manifest create $IMAGE_SHA $IMAGE_SHA_amd64 $IMAGE_SHA_ppc64le - docker manifest push $IMAGE_SHA - -======= - - echo GOPATH=$GOPATH - - mkdir -p $GOPATH/src/code.vereign.com/code - - ln -s `pwd` $GOPATH/src/code.vereign.com/code/ - - cd $GOPATH/src/code.vereign.com/code/vcl - - git config --global credential.https://code.vereign.com.username gitlab-ci-token - - git config --global credential.helper "store --file /tmp/store" - - echo https://gitlab-ci-token:$CI_JOB_TOKEN@code.vereign.com > /tmp/store - - make - - tar -czf build.tgz -C /builds/code/vcl/javascript/dist/. . ->>>>>>> 08455e86aa8627cd0438093d1adab34df9af57d6 -