mirror of
				https://gitea.publichub.eu/oscar.krause/fastapi-dls.git
				synced 2025-11-04 01:06:08 +00:00 
			
		
		
		
	fixes
This commit is contained in:
		@@ -22,8 +22,9 @@ sha256sums=('SKIP'
 | 
				
			|||||||
            '3dc60140c08122a8ec0e7fa7f0937eb8c1288058890ba09478420fc30ce9e30c')
 | 
					            '3dc60140c08122a8ec0e7fa7f0937eb8c1288058890ba09478420fc30ce9e30c')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
pkgver() {
 | 
					pkgver() {
 | 
				
			||||||
 | 
					  echo -e "VERSION=$VERSION\nCOMMIT=$CI_COMMIT_SHA" > $srcdir/$pkgname/version.env
 | 
				
			||||||
  source $srcdir/$pkgname/version.env
 | 
					  source $srcdir/$pkgname/version.env
 | 
				
			||||||
  echo ${VERSION}
 | 
					  echo $VERSION
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
check() {
 | 
					check() {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -43,12 +43,14 @@ build:apt:
 | 
				
			|||||||
      changes:
 | 
					      changes:
 | 
				
			||||||
        - app/**/*
 | 
					        - app/**/*
 | 
				
			||||||
        - .DEBIAN/**/*
 | 
					        - .DEBIAN/**/*
 | 
				
			||||||
 | 
					        - .gitlab-ci.yml
 | 
				
			||||||
      variables:
 | 
					      variables:
 | 
				
			||||||
        VERSION: "0.0.1"
 | 
					        VERSION: "0.0.1"
 | 
				
			||||||
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 | 
					    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 | 
				
			||||||
      variables:
 | 
					      variables:
 | 
				
			||||||
        VERSION: "0.0.1"
 | 
					        VERSION: "0.0.1"
 | 
				
			||||||
  before_script:
 | 
					  before_script:
 | 
				
			||||||
 | 
					    - echo $VERSION
 | 
				
			||||||
    - echo -e "VERSION=$VERSION\nCOMMIT=$CI_COMMIT_SHA" > version.env
 | 
					    - echo -e "VERSION=$VERSION\nCOMMIT=$CI_COMMIT_SHA" > version.env
 | 
				
			||||||
    # install build dependencies
 | 
					    # install build dependencies
 | 
				
			||||||
    - apt-get update -qq && apt-get install -qq -y build-essential
 | 
					    - apt-get update -qq && apt-get install -qq -y build-essential
 | 
				
			||||||
@@ -71,7 +73,7 @@ build:apt:
 | 
				
			|||||||
    - cd build/
 | 
					    - cd build/
 | 
				
			||||||
  script:
 | 
					  script:
 | 
				
			||||||
    # set version based on value in "$CI_BUILD_REF_NAME"
 | 
					    # set version based on value in "$CI_BUILD_REF_NAME"
 | 
				
			||||||
    - sed -i -E 's/(Version\:\s)0.0/\1'"$CI_BUILD_REF_NAME"'/g' DEBIAN/control
 | 
					    - sed -i -E 's/(Version\:\s)0.0/\1'"$VERSION"'/g' DEBIAN/control
 | 
				
			||||||
    # build
 | 
					    # build
 | 
				
			||||||
    - dpkg -b . build.deb
 | 
					    - dpkg -b . build.deb
 | 
				
			||||||
    - dpkg -I build.deb
 | 
					    - dpkg -I build.deb
 | 
				
			||||||
@@ -92,13 +94,14 @@ build:pacman:
 | 
				
			|||||||
      changes:
 | 
					      changes:
 | 
				
			||||||
        - app/**/*
 | 
					        - app/**/*
 | 
				
			||||||
        - .PKGBUILD/**/*
 | 
					        - .PKGBUILD/**/*
 | 
				
			||||||
 | 
					        - .gitlab-ci.yml
 | 
				
			||||||
      variables:
 | 
					      variables:
 | 
				
			||||||
        VERSION: "0.0.1"
 | 
					        VERSION: "0.0.1"
 | 
				
			||||||
    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 | 
					    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 | 
				
			||||||
      variables:
 | 
					      variables:
 | 
				
			||||||
        VERSION: "0.0.1"
 | 
					        VERSION: "0.0.1"
 | 
				
			||||||
  before_script:
 | 
					  before_script:
 | 
				
			||||||
    - echo -e "VERSION=$CI_BUILD_REF_NAME\nCOMMIT=$CI_COMMIT_SHA" > version.env
 | 
					    #- echo -e "VERSION=$VERSION\nCOMMIT=$CI_COMMIT_SHA" > version.env
 | 
				
			||||||
    # install build dependencies
 | 
					    # install build dependencies
 | 
				
			||||||
    - pacman -Syu --noconfirm git
 | 
					    - pacman -Syu --noconfirm git
 | 
				
			||||||
    # create a build-user because "makepkg" don't like root user
 | 
					    # create a build-user because "makepkg" don't like root user
 | 
				
			||||||
@@ -113,7 +116,7 @@ build:pacman:
 | 
				
			|||||||
    # download dependencies
 | 
					    # download dependencies
 | 
				
			||||||
    - source PKGBUILD && pacman -Syu --noconfirm --needed --asdeps "${makedepends[@]}" "${depends[@]}"
 | 
					    - source PKGBUILD && pacman -Syu --noconfirm --needed --asdeps "${makedepends[@]}" "${depends[@]}"
 | 
				
			||||||
    # build
 | 
					    # build
 | 
				
			||||||
    - sudo -u build makepkg -s
 | 
					    - sudo --preserve-env -u build makepkg -s
 | 
				
			||||||
  artifacts:
 | 
					  artifacts:
 | 
				
			||||||
    expire_in: 1 week
 | 
					    expire_in: 1 week
 | 
				
			||||||
    paths:
 | 
					    paths:
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user