Commit 5ccfa6b3 authored by Federico Falconieri's avatar Federico Falconieri
Browse files

Merge branch 'main' into rhtenhove-beta-patch-01383

parents c1933718 62a7d7f4

.gitlab-ci.yml

+8 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ gitlab:recommended: 
  variables:

    GITLAB_RECOMMENDED_AUTO_FIX: "true"





pages:

  stage: test

  before_script:
@@ -70,11 +69,19 @@ pipelines:python: 
      - local: tests/pipelines/python.yml

    strategy: depend



<<<<<<< HEAD

pipelines:container:polirepo:

  stage: test

  trigger:

    include:

      - local: tests/pipelines/container/polirepo.yml

=======

pipelines:container:polyrepo:

  stage: test

  trigger:

    include:

      - local: tests/pipelines/container/polyrepo.yml

>>>>>>> main

    strategy: depend



pipelines:container:monorepo:

README.md

+6 −6
Original line number Diff line number Diff line 
# Just CI templates v4.1.1

# Just CI templates v5.1.0



Maintainers:

* Federico Falconieri: @falcorocks
@@ -42,7 +42,7 @@ Here is an example `.gitlab-ci.yml` importing the python template: 
include:

  - project: 'just-ci/templates'

    file: 'templates/python.yml'

    ref: 'v4.1.1'

    ref: 'v5.1.0'

```



The above is a template for Python projects. Other templates can be found in `templates/`, for example:
@@ -59,7 +59,7 @@ Templates and pipelines may come with jobs you don't want/need to run. We have c 
include:

  - project: 'just-ci/templates'

    file: 'templates/python.yml'

    ref: 'v4.1.1'

    ref: 'v5.1.0'



python:pytest:

  rules:
@@ -85,7 +85,7 @@ include: 


We support both! Read [this](pipelines/container/readme.md) for more information on how to configure pipelines for monorepos and polirepos.



### example python polirepo

### example python polyrepo



Polirepos will likely work out of the box without extra configuration needed.
@@ -94,7 +94,7 @@ Polirepos will likely work out of the box without extra configuration needed. 
include:

  - project: 'just-ci/templates'

    file: 'templates/container/python.yml'

    ref: v5.0.0-beta.1

    ref: v5.1.0-beta.1

```



### example monorepo
@@ -106,7 +106,7 @@ In monorepos you can start by including the following, but you will need to writ 
include:

  - project: 'just-ci/templates'

    file: 'templates/container/monorepo.yml'

    ref: v5.0.0-beta.1

    ref: v5.1.0-beta.1

```

cd/ssh/clone.yml

+11 −0
Original line number Diff line number Diff line 
---

<<<<<<< HEAD

variables:

  GIT_SUBMODULE_STRATEGY: recursive



clone:

  extends: .ssh

=======

clone:

  extends: .ssh

  GIT_SUBMODULE_STRATEGY: recursive

>>>>>>> main

  script:

    - ssh ${REMOTE_USER}@${REMOTE_HOST} "

        git config --global user.email 'bot@mail.com' &&

        git config --global user.name 'bot' &&

<<<<<<< HEAD

        rm -rf $CI_PROJECT_NAME &&

        git clone --recurse-submodules --branch $CI_COMMIT_REF_NAME --depth 1 https://${DEPLOY_USER}:${DEPLOY_TOKEN}@${CI_SERVER_HOST}/gitlab/${CI_PROJECT_PATH} &&

=======

        rm -rf ${CI_PROJECT_NAME} &&

        git clone --recurse-submodules --branch ${CI_COMMIT_REF_NAME} --depth 1 https://${DEPLOY_USER}:${DEPLOY_TOKEN}@${CI_SERVER_HOST}/gitlab/${CI_PROJECT_PATH} &&

>>>>>>> main

        exit"

cd/ssh/docker-login.yml

+4 −0
Original line number Diff line number Diff line
@@ -2,4 +2,8 @@ 
docker:login:

  extends: .ssh

  script:

<<<<<<< HEAD

    - ssh ${REMOTE_USER}@${REMOTE_HOST} "docker login ${CI_REGISTRY} -u ${DEPLOY_USER} -p ${DEPLOY_TOKEN}"

=======

    - ssh ${REMOTE_USER}@${REMOTE_HOST} -p ${REMOTE_PORT:=22} "docker login ${CI_REGISTRY} -u ${DEPLOY_USER} -p ${DEPLOY_TOKEN}"

>>>>>>> main

cd/ssh/scp.yml

+4 −0
Original line number Diff line number Diff line
@@ -3,4 +3,8 @@ scp: 
  extends: .ssh

  stage: deliver

  script:

<<<<<<< HEAD

    - scp -r $CI_PROJECT_DIR ${REMOTE_USER}@${REMOTE_HOST}:${SCP_REMOTE_DEST_DIR} || true

=======

    - scp -r "${CI_PROJECT_DIR}" ${REMOTE_USER}@${REMOTE_HOST}:"${SCP_REMOTE_DEST_DIR}" || true

>>>>>>> main