TRAVIS_TAG set for deploy-docker.sh (#2445)
* TRAVIS_TAG set for deploy-docker.sh * build beta artifact for nix beta * fix tags to only increment latest-including-rc on beta
This commit is contained in:
		
					parent
					
						
							
								39fbc209e1
							
						
					
				
			
			
				commit
				
					
						0d90226391
					
				
			
		
					 3 changed files with 7 additions and 4 deletions
				
			
		
							
								
								
									
										4
									
								
								.github/workflows/beta_artifacts.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/beta_artifacts.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -44,7 +44,7 @@ jobs:
 | 
			
		|||
      - name: Fetch Deps
 | 
			
		||||
        run: ci/actions/linux/install_deps.sh
 | 
			
		||||
      - name: Build Artifact
 | 
			
		||||
        run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
 | 
			
		||||
        run: docker run -v ${GITHUB_WORKSPACE}:/workspace nanocurrency/nano-env:gcc /bin/bash -c "cd /workspace && BETA=1 TRAVIS_TAG=${TAG} ci/build-deploy.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
 | 
			
		||||
      - name: Deploy Artifact
 | 
			
		||||
        run: ci/actions/deploy.sh
 | 
			
		||||
        env:
 | 
			
		||||
| 
						 | 
				
			
			@ -52,7 +52,7 @@ jobs:
 | 
			
		|||
          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 | 
			
		||||
          AWS_DEFAULT_REGION: us-east-2   
 | 
			
		||||
      - name: Deploy Docker (nanocurrency/nano-beta)
 | 
			
		||||
        run: ci/actions/linux/deploy-docker.sh
 | 
			
		||||
        run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
 | 
			
		||||
        env:
 | 
			
		||||
          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}     
 | 
			
		||||
  
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								.github/workflows/live_artifacts.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/live_artifacts.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -51,7 +51,7 @@ jobs:
 | 
			
		|||
          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 | 
			
		||||
          AWS_DEFAULT_REGION: us-east-2     
 | 
			
		||||
      - name: Deploy Docker (nanocurrency/nano)
 | 
			
		||||
        run: ci/actions/linux/deploy-docker.sh
 | 
			
		||||
        run: TRAVIS_TAG=${TAG} ci/actions/linux/deploy-docker.sh
 | 
			
		||||
        env:
 | 
			
		||||
          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}   
 | 
			
		||||
  
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,7 +16,10 @@ if [ -n "$DOCKER_PASSWORD" ]; then
 | 
			
		|||
    else
 | 
			
		||||
        tags=()
 | 
			
		||||
        if [ -n "$TRAVIS_TAG" ]; then
 | 
			
		||||
            tags+=("$TRAVIS_TAG" latest latest-including-rc)
 | 
			
		||||
            tags+=("$TRAVIS_TAG" latest)
 | 
			
		||||
            if [[ "$GITHUB_WORKFLOW" = "Beta" ]]; then
 | 
			
		||||
                tags+=(latest-including-rc)
 | 
			
		||||
            fi
 | 
			
		||||
        elif [ -n "$TRAVIS_BRANCH" ]; then
 | 
			
		||||
            TRAVIS_TAG=$TRAVIS_BRANCH
 | 
			
		||||
            tags+=("$TRAVIS_BRANCH")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue