Fixed mastodon version injection into containers via github actions (#24873)
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/workflows/build-image.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build-image.yml
									
									
									
									
										vendored
									
									
								
							@@ -61,7 +61,7 @@ jobs:
 | 
				
			|||||||
        id: version_vars
 | 
					        id: version_vars
 | 
				
			||||||
        if: github.repository == 'mastodon/mastodon' && github.event_name == 'push' && github.ref_name == 'main'
 | 
					        if: github.repository == 'mastodon/mastodon' && github.event_name == 'push' && github.ref_name == 'main'
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          echo mastodon_version_suffix=\"+edge-$(git rev-parse --short HEAD)\" >> $GITHUB_OUTPUT
 | 
					          echo mastodon_version_suffix=+edge-$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - uses: docker/build-push-action@v4
 | 
					      - uses: docker/build-push-action@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/build-nightly.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build-nightly.yml
									
									
									
									
										vendored
									
									
								
							@@ -44,7 +44,7 @@ jobs:
 | 
				
			|||||||
      - name: Generate version suffix
 | 
					      - name: Generate version suffix
 | 
				
			||||||
        id: version_vars
 | 
					        id: version_vars
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          echo mastodon_version_suffix=\"+nightly-$(date +'%Y%m%d')\" >> $GITHUB_OUTPUT
 | 
					          echo mastodon_version_suffix=+nightly-$(date +'%Y%m%d') >> $GITHUB_OUTPUT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - uses: docker/build-push-action@v4
 | 
					      - uses: docker/build-push-action@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user