mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						3472536796
					
				
							
								
								
									
										2
									
								
								.github/workflows/api.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/api.yml
									
									
									
									
										vendored
									
									
								
							@ -25,7 +25,7 @@ jobs:
 | 
				
			|||||||
    if: github.repository == 'qmk/qmk_firmware'
 | 
					    if: github.repository == 'qmk/qmk_firmware'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        fetch-depth: 1
 | 
					        fetch-depth: 1
 | 
				
			||||||
        persist-credentials: false
 | 
					        persist-credentials: false
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/auto_tag.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/auto_tag.yml
									
									
									
									
										vendored
									
									
								
							@ -27,7 +27,7 @@ jobs:
 | 
				
			|||||||
    if: github.repository == 'qmk/qmk_firmware'
 | 
					    if: github.repository == 'qmk/qmk_firmware'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        fetch-depth: 0
 | 
					        fetch-depth: 0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/ci_builds.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/ci_builds.yml
									
									
									
									
										vendored
									
									
								
							@ -33,7 +33,7 @@ jobs:
 | 
				
			|||||||
    - name: Disable safe.directory check
 | 
					    - name: Disable safe.directory check
 | 
				
			||||||
      run : git config --global --add safe.directory '*'
 | 
					      run : git config --global --add safe.directory '*'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        submodules: recursive
 | 
					        submodules: recursive
 | 
				
			||||||
        ref: ${{ github.event.inputs.branch || github.ref }}
 | 
					        ref: ${{ github.event.inputs.branch || github.ref }}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/cli.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/cli.yml
									
									
									
									
										vendored
									
									
								
							@ -24,7 +24,7 @@ jobs:
 | 
				
			|||||||
    - name: Disable safe.directory check
 | 
					    - name: Disable safe.directory check
 | 
				
			||||||
      run : git config --global --add safe.directory '*'
 | 
					      run : git config --global --add safe.directory '*'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        submodules: recursive
 | 
					        submodules: recursive
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/develop_update.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/develop_update.yml
									
									
									
									
										vendored
									
									
								
							@ -15,7 +15,7 @@ jobs:
 | 
				
			|||||||
    if: github.repository == 'qmk/qmk_firmware'
 | 
					    if: github.repository == 'qmk/qmk_firmware'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        token: ${{ secrets.QMK_BOT_TOKEN }}
 | 
					        token: ${{ secrets.QMK_BOT_TOKEN }}
 | 
				
			||||||
        fetch-depth: 0
 | 
					        fetch-depth: 0
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/docs.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/docs.yml
									
									
									
									
										vendored
									
									
								
							@ -23,7 +23,7 @@ jobs:
 | 
				
			|||||||
    if: github.repository == 'qmk/qmk_firmware'
 | 
					    if: github.repository == 'qmk/qmk_firmware'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        fetch-depth: 1
 | 
					        fetch-depth: 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/feature_branch_update.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/feature_branch_update.yml
									
									
									
									
										vendored
									
									
								
							@ -21,7 +21,7 @@ jobs:
 | 
				
			|||||||
        - riot
 | 
					        - riot
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        token: ${{ secrets.QMK_BOT_TOKEN }}
 | 
					        token: ${{ secrets.QMK_BOT_TOKEN }}
 | 
				
			||||||
        fetch-depth: 0
 | 
					        fetch-depth: 0
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/format.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/format.yml
									
									
									
									
										vendored
									
									
								
							@ -25,7 +25,7 @@ jobs:
 | 
				
			|||||||
    - name: Disable safe.directory check
 | 
					    - name: Disable safe.directory check
 | 
				
			||||||
      run : git config --global --add safe.directory '*'
 | 
					      run : git config --global --add safe.directory '*'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        fetch-depth: 0
 | 
					        fetch-depth: 0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/format_push.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/format_push.yml
									
									
									
									
										vendored
									
									
								
							@ -19,7 +19,7 @@ jobs:
 | 
				
			|||||||
    - name: Disable safe.directory check
 | 
					    - name: Disable safe.directory check
 | 
				
			||||||
      run : git config --global --add safe.directory '*'
 | 
					      run : git config --global --add safe.directory '*'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        fetch-depth: 0
 | 
					        fetch-depth: 0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/lint.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/lint.yml
									
									
									
									
										vendored
									
									
								
							@ -18,7 +18,7 @@ jobs:
 | 
				
			|||||||
    - name: Disable safe.directory check
 | 
					    - name: Disable safe.directory check
 | 
				
			||||||
      run : git config --global --add safe.directory '*'
 | 
					      run : git config --global --add safe.directory '*'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        fetch-depth: 0
 | 
					        fetch-depth: 0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/regen.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/regen.yml
									
									
									
									
										vendored
									
									
								
							@ -19,7 +19,7 @@ jobs:
 | 
				
			|||||||
    - name: Disable safe.directory check
 | 
					    - name: Disable safe.directory check
 | 
				
			||||||
      run : git config --global --add safe.directory '*'
 | 
					      run : git config --global --add safe.directory '*'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: Run qmk generators
 | 
					    - name: Run qmk generators
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/regen_push.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/regen_push.yml
									
									
									
									
										vendored
									
									
								
							@ -19,7 +19,7 @@ jobs:
 | 
				
			|||||||
    - name: Disable safe.directory check
 | 
					    - name: Disable safe.directory check
 | 
				
			||||||
      run : git config --global --add safe.directory '*'
 | 
					      run : git config --global --add safe.directory '*'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: Run qmk generators
 | 
					    - name: Run qmk generators
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/unit_test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/unit_test.yml
									
									
									
									
										vendored
									
									
								
							@ -26,7 +26,7 @@ jobs:
 | 
				
			|||||||
    container: ghcr.io/qmk/qmk_cli
 | 
					    container: ghcr.io/qmk/qmk_cli
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v3
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        submodules: recursive
 | 
					        submodules: recursive
 | 
				
			||||||
    - name: Install dependencies
 | 
					    - name: Install dependencies
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user