Compare commits
	
		
			7 Commits
		
	
	
		
			v0.35.0
			...
			cut-releas
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c45022e9d8 | |||
| baf71cb94b | |||
| 7cc1b3f744 | |||
| 10b3852ae5 | |||
| 5e43971492 | |||
| 194d9c6774 | |||
| fa5f033574 | 
							
								
								
									
										43
									
								
								.github/workflows/build-test-publish-apps.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										43
									
								
								.github/workflows/build-test-publish-apps.yml
									
									
									
									
										vendored
									
									
								
							| @ -5,6 +5,7 @@ on: | |||||||
|   push: |   push: | ||||||
|     branches: |     branches: | ||||||
|       - main |       - main | ||||||
|  |       - cut-release-v0.25.0-updater-test-try-again | ||||||
|   release: |   release: | ||||||
|     types: [published] |     types: [published] | ||||||
|   schedule: |   schedule: | ||||||
| @ -13,12 +14,12 @@ on: | |||||||
|   # Will checkout the last commit from the default branch (main as of 2023-10-04) |   # Will checkout the last commit from the default branch (main as of 2023-10-04) | ||||||
|  |  | ||||||
| env: | env: | ||||||
|   CUT_RELEASE_PR: ${{ github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }} |   CUT_RELEASE_PR: true | ||||||
|   BUILD_RELEASE: ${{ github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }} |   BUILD_RELEASE: true | ||||||
|  |  | ||||||
| concurrency: | # concurrency: | ||||||
|   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} | #   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} | ||||||
|   cancel-in-progress: true | #   cancel-in-progress: true | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|   prepare-files: |   prepare-files: | ||||||
| @ -190,10 +191,10 @@ jobs: | |||||||
|       VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }} |       VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }} | ||||||
|       PUB_DATE: ${{ github.event_name == 'release' && github.event.release.created_at || github.event.repository.updated_at }} |       PUB_DATE: ${{ github.event_name == 'release' && github.event.release.created_at || github.event.repository.updated_at }} | ||||||
|       NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }} |       NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }} | ||||||
|       BUCKET_DIR: ${{ github.event_name == 'schedule' && 'dl.kittycad.io/releases/modeling-app/nightly' || 'dl.kittycad.io/releases/modeling-app' }} |       BUCKET_DIR: ${{ github.event_name == 'schedule' && 'dl.kittycad.io/releases/modeling-app/nightly' || 'dl.kittycad.io/releases/modeling-app/test/cut-release-v0.25.0-updater-test' }} | ||||||
|       WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }} |       WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app/test/cut-release-v0.25.0-updater-test' }} | ||||||
|       BUCKET_DIR_TAURI: 'dl.kittycad.io/releases/modeling-app/tauri-compat' |       BUCKET_DIR_TAURI: 'dl.kittycad.io/releases/modeling-app/test/cut-release-v0.25.0-updater-test/tauri-compat' | ||||||
|       WEBSITE_DIR_TAURI: 'dl.zoo.dev/releases/modeling-app/tauri-compat' |       WEBSITE_DIR_TAURI: 'dl.zoo.dev/releases/modeling-app/test/cut-release-v0.25.0-updater-test/tauri-compat' | ||||||
|       URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }} |       URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }} | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/checkout@v4 |       - uses: actions/checkout@v4 | ||||||
| @ -318,19 +319,19 @@ jobs: | |||||||
|           path: last_download.json |           path: last_download.json | ||||||
|           destination: ${{ env.BUCKET_DIR }} |           destination: ${{ env.BUCKET_DIR }} | ||||||
|  |  | ||||||
|       - name: Upload release files to public bucket for tauri |       # - name: Upload release files to public bucket for tauri | ||||||
|         uses: google-github-actions/upload-cloud-storage@v2.1.1 |       #   uses: google-github-actions/upload-cloud-storage@v2.1.1 | ||||||
|         with: |       #   with: | ||||||
|           path: "out/tauri/${{ env.VERSION }}"  |       #     path: "out/tauri/${{ env.VERSION }}"  | ||||||
|           glob: '*/Zoo*' |       #     glob: '*/Zoo*' | ||||||
|           parent: false |       #     parent: false | ||||||
|           destination: ${{ env.BUCKET_DIR_TAURI }}/${{ env.VERSION }} |       #     destination: ${{ env.BUCKET_DIR_TAURI }}/${{ env.VERSION }} | ||||||
|  |  | ||||||
|       - name: Upload update endpoint to public bucket for tauri |       # - name: Upload update endpoint to public bucket for tauri | ||||||
|         uses: google-github-actions/upload-cloud-storage@v2.1.1 |       #   uses: google-github-actions/upload-cloud-storage@v2.1.1 | ||||||
|         with: |       #   with: | ||||||
|           path: last_update.json |       #     path: last_update.json | ||||||
|           destination: ${{ env.BUCKET_DIR }} |       #     destination: ${{ env.BUCKET_DIR }} | ||||||
|  |  | ||||||
|       - name: Upload release files to Github |       - name: Upload release files to Github | ||||||
|         if: ${{ github.event_name == 'release' }} |         if: ${{ github.event_name == 'release' }} | ||||||
|  | |||||||
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 55 KiB | 
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 47 KiB | 
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB | 
| @ -61,5 +61,5 @@ linux: | |||||||
|  |  | ||||||
| publish: | publish: | ||||||
|   - provider: generic |   - provider: generic | ||||||
|     url: https://dl.zoo.dev/releases/modeling-app/test/electron-builder |     url: https://dl.zoo.dev/releases/modeling-app/test/cut-release-v0.25.0-updater-test | ||||||
|     channel: latest |     channel: latest | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
|   "name": "zoo-modeling-app", |   "name": "zoo-modeling-app", | ||||||
|   "version": "0.24.12", |   "version": "0.25.3", | ||||||
|   "private": true, |   "private": true, | ||||||
|   "productName": "Zoo Modeling App", |   "productName": "Zoo Modeling App", | ||||||
|   "author": { |   "author": { | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	