mirror of
				https://github.com/f-droid/fdroidserver.git
				synced 2025-11-03 22:20:28 +03:00 
			
		
		
		
	gitlab-ci: include pycountry in all master-only jobs
follow up from !1418
This commit is contained in:
		
							parent
							
								
									79bb763986
								
							
						
					
					
						commit
						69ccce0644
					
				
					 1 changed files with 6 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -100,6 +100,7 @@ debian_testing:
 | 
			
		|||
        gnupg
 | 
			
		||||
        ipfs-cid
 | 
			
		||||
        python3-defusedxml
 | 
			
		||||
        python3-pycountry
 | 
			
		||||
        python3-setuptools
 | 
			
		||||
        sdkmanager
 | 
			
		||||
    - python3 -c 'import fdroidserver'
 | 
			
		||||
| 
						 | 
				
			
			@ -123,7 +124,7 @@ ubuntu_lts_ppa:
 | 
			
		|||
    - echo "deb http://ppa.launchpad.net/fdroid/fdroidserver/ubuntu $RELEASE main" >> /etc/apt/sources.list
 | 
			
		||||
    - apt-get update
 | 
			
		||||
    - apt-get dist-upgrade
 | 
			
		||||
    - apt-get install --install-recommends dexdump fdroidserver git python3-setuptools sdkmanager
 | 
			
		||||
    - apt-get install --install-recommends dexdump fdroidserver git python3-pycountry python3-setuptools sdkmanager
 | 
			
		||||
 | 
			
		||||
    # Test things work with a default branch other than 'master'
 | 
			
		||||
    - git config --global init.defaultBranch thisisnotmasterormain
 | 
			
		||||
| 
						 | 
				
			
			@ -291,6 +292,7 @@ fedora_latest:
 | 
			
		|||
                     python3-babel
 | 
			
		||||
                     python3-matplotlib
 | 
			
		||||
                     python3-pip
 | 
			
		||||
                     python3-pycountry
 | 
			
		||||
                     rsync
 | 
			
		||||
                     which
 | 
			
		||||
    - $pip install sdkmanager
 | 
			
		||||
| 
						 | 
				
			
			@ -347,6 +349,9 @@ macOS:
 | 
			
		|||
    - /bin/bash --version
 | 
			
		||||
    - /bin/bash -n gradlew-fdroid tests/run-tests
 | 
			
		||||
 | 
			
		||||
    # TODO remove the packages below once they are included in the Homebrew package
 | 
			
		||||
    - $(brew --prefix fdroidserver)/libexec/bin/python3 -m pip install pycountry
 | 
			
		||||
 | 
			
		||||
    # test fdroidserver from git with current package's dependencies
 | 
			
		||||
    - fdroid="$(brew --prefix fdroidserver)/libexec/bin/python3 $PWD/fdroid" ./tests/run-tests
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue