mirror of
				https://gitea.publichub.eu/oscar.krause/fastapi-dls.git
				synced 2025-11-04 09:07:45 +00:00 
			
		
		
		
	Merge branch 'main' into 'dev'
# Conflicts: # .gitlab-ci.yml
This commit is contained in:
		@@ -16,12 +16,12 @@ build:docker:
 | 
			
		||||
  interruptible: true
 | 
			
		||||
  stage: build
 | 
			
		||||
  rules:
 | 
			
		||||
    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
 | 
			
		||||
    # deployment is in "deploy:docker:"
 | 
			
		||||
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 | 
			
		||||
      changes:
 | 
			
		||||
        - app/**/*
 | 
			
		||||
        - Dockerfile
 | 
			
		||||
        - requirements.txt
 | 
			
		||||
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 | 
			
		||||
  tags: [ docker ]
 | 
			
		||||
  before_script:
 | 
			
		||||
    - docker buildx inspect
 | 
			
		||||
@@ -44,16 +44,13 @@ build:apt:
 | 
			
		||||
    - if: $CI_COMMIT_TAG
 | 
			
		||||
      variables:
 | 
			
		||||
        VERSION: $CI_COMMIT_REF_NAME
 | 
			
		||||
    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
 | 
			
		||||
    - if: ($CI_PIPELINE_SOURCE == 'merge_request_event') || ($CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH)
 | 
			
		||||
      changes:
 | 
			
		||||
        - app/**/*
 | 
			
		||||
        - .DEBIAN/**/*
 | 
			
		||||
        - .gitlab-ci.yml
 | 
			
		||||
      variables:
 | 
			
		||||
        VERSION: "0.0.1"
 | 
			
		||||
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 | 
			
		||||
      variables:
 | 
			
		||||
        VERSION: "0.0.1"
 | 
			
		||||
  before_script:
 | 
			
		||||
    - echo -e "VERSION=$VERSION\nCOMMIT=$CI_COMMIT_SHA" > version.env
 | 
			
		||||
    # install build dependencies
 | 
			
		||||
@@ -94,16 +91,13 @@ build:pacman:
 | 
			
		||||
    - if: $CI_COMMIT_TAG
 | 
			
		||||
      variables:
 | 
			
		||||
        VERSION: $CI_COMMIT_REF_NAME
 | 
			
		||||
    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
 | 
			
		||||
    - if: ($CI_PIPELINE_SOURCE == 'merge_request_event') || ($CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH)
 | 
			
		||||
      changes:
 | 
			
		||||
        - app/**/*
 | 
			
		||||
        - .PKGBUILD/**/*
 | 
			
		||||
        - .gitlab-ci.yml
 | 
			
		||||
      variables:
 | 
			
		||||
        VERSION: "0.0.1"
 | 
			
		||||
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 | 
			
		||||
      variables:
 | 
			
		||||
        VERSION: "0.0.1"
 | 
			
		||||
  before_script:
 | 
			
		||||
    #- echo -e "VERSION=$VERSION\nCOMMIT=$CI_COMMIT_SHA" > version.env
 | 
			
		||||
    # install build dependencies
 | 
			
		||||
@@ -170,7 +164,8 @@ test:apt:
 | 
			
		||||
  image: $IMAGE
 | 
			
		||||
  stage: test
 | 
			
		||||
  rules:
 | 
			
		||||
    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
 | 
			
		||||
    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 | 
			
		||||
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 | 
			
		||||
      changes:
 | 
			
		||||
        - app/**/*
 | 
			
		||||
        - .DEBIAN/**/*
 | 
			
		||||
@@ -217,11 +212,12 @@ test:apt:
 | 
			
		||||
test:pacman:archlinux:
 | 
			
		||||
  image: archlinux:base
 | 
			
		||||
  rules:
 | 
			
		||||
    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
 | 
			
		||||
    - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 | 
			
		||||
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 | 
			
		||||
      changes:
 | 
			
		||||
        - app/**/*
 | 
			
		||||
        - .PKGBUILD/**/*
 | 
			
		||||
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 | 
			
		||||
        - .gitlab-ci.yml
 | 
			
		||||
  needs:
 | 
			
		||||
    - job: build:pacman
 | 
			
		||||
      artifacts: true
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user