mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	the path confusion is vert annoying
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
		
							parent
							
								
									c2acdafcdf
								
							
						
					
					
						commit
						8fb504941e
					
				
					 3 changed files with 17 additions and 5 deletions
				
			
		
							
								
								
									
										6
									
								
								.github/workflows/linux-trusty-5.12.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.github/workflows/linux-trusty-5.12.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -21,8 +21,12 @@ jobs: | |||
|       id: version_number | ||||
|       if: github.event_name == 'push' | ||||
|       run: | | ||||
|         bash scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release" | ||||
|         bash -x ./scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release" | ||||
|         echo "in yml we have PWD $(pwd)" | ||||
|         ls -l release-version | ||||
|         cat release-version | ||||
|         version=$(<release-version) | ||||
|         echo "version=$version" | ||||
|         echo "version=$version" >> $GITHUB_OUTPUT | ||||
| 
 | ||||
|     - name: store dummy version and build number for pull request | ||||
|  |  | |||
							
								
								
									
										5
									
								
								.github/workflows/windows.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/windows.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -22,10 +22,13 @@ jobs: | |||
|       if: github.event_name == 'push' | ||||
|       run: | | ||||
|         bash scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release" | ||||
|         echo "in yml we have PWD $(pwd)" | ||||
|         ls -l release-version | ||||
|         cat release-version | ||||
|         version=$(<release-version) | ||||
|         echo "version=$version" | ||||
|         echo "version=$version" >> $GITHUB_OUTPUT | ||||
| 
 | ||||
| 
 | ||||
|     - name: store dummy version and build number for pull request | ||||
|       if: github.event_name == 'pull_request' | ||||
|       run: | | ||||
|  |  | |||
|  | @ -11,16 +11,21 @@ | |||
| # checkout the nightly-builds repo in parallel to the main repo | ||||
| # the clone followed by the pointless push should verify that the password is stored in the config | ||||
| # that way the script doesn't need the password | ||||
| cd .. | ||||
| SCRIPT_SOURCE=$(dirname "${BASH_SOURCE[0]}") | ||||
| PARENT_DIR=$(cd "$SCRIPT_SOURCE"/../.. && pwd) | ||||
| url="https://subsurface:$2@github.com/subsurface/nightly-builds" | ||||
| cd "$PARENT_DIR" | ||||
| git clone -b main https://github.com/subsurface/nightly-builds | ||||
| cd nightly-builds | ||||
| git remote set-url origin "$url" | ||||
| git push origin main | ||||
| echo "build number prior to get-or-create was $(<latest-subsurface-buildnumber)" | ||||
| cd .. | ||||
| cd "$PARENT_DIR" | ||||
| bash -x subsurface/scripts/get-or-create-build-nr.sh "$1" | ||||
| echo "build number after get-or-create is $(<nightly-builds/latest-subsurface-buildnumber)" | ||||
| cp nightly-builds/latest-subsurface-buildnumber subsurface | ||||
| cp nightly-builds/latest-subsurface-buildnumber subsurface/ | ||||
| [[ -n $3 ]] && echo "$3" > subsurface/latest-subsurface-buildnumber-extension | ||||
| bash subsurface/scripts/get-version > subsurface/release-version | ||||
| echo "$PARENT_DIR" | ||||
| ls -l "$PARENT_DIR"/subsurface/release-version | ||||
| cat "$PARENT_DIR"/subsurface/release-version | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue