mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-11-03 22:55:43 +00:00 
			
		
		
		
	Fix for stable branch push (#3619)
* Fix for stable branch push * Ensure we don't update stable to an older release
This commit is contained in:
		
							
								
								
									
										7
									
								
								.github/workflows/docker.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/docker.yaml
									
									
									
									
										vendored
									
									
								
							@@ -105,10 +105,3 @@ jobs:
 | 
				
			|||||||
          COSIGN_EXPERIMENTAL: "true"
 | 
					          COSIGN_EXPERIMENTAL: "true"
 | 
				
			||||||
        run: cosign sign ${{ steps.meta.outputs.tags }}@${{
 | 
					        run: cosign sign ${{ steps.meta.outputs.tags }}@${{
 | 
				
			||||||
          steps.build-and-push.outputs.digest }}
 | 
					          steps.build-and-push.outputs.digest }}
 | 
				
			||||||
      - name: Push to Stable Branch
 | 
					 | 
				
			||||||
        uses: ad-m/github-push-action@9a46ba8d86d3171233e861a4351b1278a2805c83 # pin@master
 | 
					 | 
				
			||||||
        if: env.stable_release == 'true' && github.event_name != 'pull_request'
 | 
					 | 
				
			||||||
        with:
 | 
					 | 
				
			||||||
          github_token: ${{ secrets.GITHUB_TOKEN }}
 | 
					 | 
				
			||||||
          branch: stable
 | 
					 | 
				
			||||||
          force: true
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										18
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							@@ -6,6 +6,24 @@ on:
 | 
				
			|||||||
    types: [ published ]
 | 
					    types: [ published ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  stable:
 | 
				
			||||||
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
 | 
					    steps:
 | 
				
			||||||
 | 
					      - name: Checkout Code
 | 
				
			||||||
 | 
					        uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # pin@v2
 | 
				
			||||||
 | 
					      - name: Version Check
 | 
				
			||||||
 | 
					        run: |
 | 
				
			||||||
 | 
					          pip install requests
 | 
				
			||||||
 | 
					          python3 ci/version_check.py
 | 
				
			||||||
 | 
					      - name: Push to Stable Branch
 | 
				
			||||||
 | 
					        uses: ad-m/github-push-action@9a46ba8d86d3171233e861a4351b1278a2805c83 # pin@master
 | 
				
			||||||
 | 
					        if: env.stable_release == 'true'
 | 
				
			||||||
 | 
					        with:
 | 
				
			||||||
 | 
					          github_token: ${{ secrets.GITHUB_TOKEN }}
 | 
				
			||||||
 | 
					          branch: stable
 | 
				
			||||||
 | 
					          force: true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  tweet:
 | 
					  tweet:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user