kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
				
				
				
			chore: Update workflow files to update workflows to 'main' (#1927)
							rodzic
							
								
									9b1f27cf17
								
							
						
					
					
						commit
						be437ebb91
					
				| 
						 | 
				
			
			@ -2,7 +2,7 @@ name: Android CI
 | 
			
		|||
 | 
			
		||||
on:
 | 
			
		||||
  push:
 | 
			
		||||
    branches: [ master ]
 | 
			
		||||
    branches: [ main ]
 | 
			
		||||
    paths-ignore:
 | 
			
		||||
      - "**.md"
 | 
			
		||||
      - ".idea/**"
 | 
			
		||||
| 
						 | 
				
			
			@ -10,7 +10,7 @@ on:
 | 
			
		|||
      - ".gitmodules"
 | 
			
		||||
 | 
			
		||||
  pull_request:
 | 
			
		||||
    branches: [ master ]
 | 
			
		||||
    branches: [ main ]
 | 
			
		||||
 | 
			
		||||
concurrency:
 | 
			
		||||
  group: build-${{ github.ref }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -13,9 +13,9 @@ name: "CodeQL Advanced"
 | 
			
		|||
 | 
			
		||||
on:
 | 
			
		||||
  # push:
 | 
			
		||||
  #   branches: [ "master" ]
 | 
			
		||||
  #   branches: [ "main" ]
 | 
			
		||||
  # pull_request:
 | 
			
		||||
  #   branches: [ "master" ]
 | 
			
		||||
  #   branches: [ "main" ]
 | 
			
		||||
  schedule:
 | 
			
		||||
    - cron: '0 0 * * *'
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -26,9 +26,9 @@ jobs:
 | 
			
		|||
          create_pull_request: true
 | 
			
		||||
          pull_request_title: 'chore(l10n): New Crowdin Translations'
 | 
			
		||||
          pull_request_body: 'New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)'
 | 
			
		||||
          pull_request_base_branch_name: 'master'
 | 
			
		||||
          pull_request_base_branch_name: 'main'
 | 
			
		||||
          pull_request_labels: 'l10n'
 | 
			
		||||
          crowdin_branch_name: 'master'
 | 
			
		||||
          crowdin_branch_name: 'main'
 | 
			
		||||
        env:
 | 
			
		||||
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 | 
			
		||||
          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,9 +1,9 @@
 | 
			
		|||
name: Crowdin Upload Sources Action
 | 
			
		||||
 | 
			
		||||
on:
 | 
			
		||||
  push:                  # Watch source strings.xml for changes on master
 | 
			
		||||
  push:                  # Watch source strings.xml for changes on main
 | 
			
		||||
    paths: [ 'app/src/main/res/values/strings.xml' ]
 | 
			
		||||
    branches: [ master ]
 | 
			
		||||
    branches: [ main ]
 | 
			
		||||
  workflow_dispatch:     # Allow manual triggering
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
| 
						 | 
				
			
			@ -22,7 +22,7 @@ jobs:
 | 
			
		|||
          upload_sources: true
 | 
			
		||||
          upload_translations: false
 | 
			
		||||
          download_translations: false
 | 
			
		||||
          crowdin_branch_name: 'master'
 | 
			
		||||
          crowdin_branch_name: 'main'
 | 
			
		||||
        env:
 | 
			
		||||
          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
 | 
			
		||||
          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,7 +19,7 @@ jobs:
 | 
			
		|||
          upload_sources: fals
 | 
			
		||||
          upload_translations: true
 | 
			
		||||
          download_translations: false
 | 
			
		||||
          crowdin_branch_name: 'master'
 | 
			
		||||
          crowdin_branch_name: 'main'
 | 
			
		||||
        env:
 | 
			
		||||
          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
 | 
			
		||||
          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -96,7 +96,7 @@ jobs:
 | 
			
		|||
        asset_name: googleRelease-${{ env.versionName }}.apk
 | 
			
		||||
        asset_content_type: application/zip
 | 
			
		||||
 | 
			
		||||
    # https://github.com/f-droid/fdroiddata/blob/master/metadata/com.geeksville.mesh.yml#L34
 | 
			
		||||
    # https://github.com/f-droid/fdroiddata/blob/main/metadata/com.geeksville.mesh.yml#L34
 | 
			
		||||
    - name: Add `version_info.txt` to release
 | 
			
		||||
      uses: actions/upload-release-asset@v1
 | 
			
		||||
      env:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -71,5 +71,5 @@ jobs:
 | 
			
		|||
            
 | 
			
		||||
            This PR was automatically generated by the update-hardware-list workflow.
 | 
			
		||||
          branch: update-hardware-list
 | 
			
		||||
          base: master
 | 
			
		||||
          base: main
 | 
			
		||||
          delete-branch: true
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -71,5 +71,5 @@ jobs:
 | 
			
		|||
            
 | 
			
		||||
            This PR was automatically generated by the update-hardware-list workflow.
 | 
			
		||||
          branch: update-hardware-list
 | 
			
		||||
          base: master
 | 
			
		||||
          base: main
 | 
			
		||||
          delete-branch: true
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Ładowanie…
	
		Reference in New Issue