From be437ebb91d61c71683901eaad463b2a132e6c38 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Sat, 24 May 2025 07:00:01 -0500 Subject: [PATCH] chore: Update workflow files to update workflows to 'main' (#1927) --- .github/workflows/android.yml | 4 ++-- .github/workflows/codeql.yml | 4 ++-- .github/workflows/crowdin-download.yml | 4 ++-- .github/workflows/crowdin-upload-sources.yml | 6 +++--- .github/workflows/crowdin-upload-translations.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/update-firmware-releases-list.yml | 2 +- .github/workflows/update-hardware-list.yml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 14b339c40..08e819a30 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -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 }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 17e592188..67050cad0 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,9 +13,9 @@ name: "CodeQL Advanced" on: # push: - # branches: [ "master" ] + # branches: [ "main" ] # pull_request: - # branches: [ "master" ] + # branches: [ "main" ] schedule: - cron: '0 0 * * *' diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml index 1f7e41e6c..a1821bca6 100644 --- a/.github/workflows/crowdin-download.yml +++ b/.github/workflows/crowdin-download.yml @@ -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 }} diff --git a/.github/workflows/crowdin-upload-sources.yml b/.github/workflows/crowdin-upload-sources.yml index 95ef4fb62..05ea3ac78 100644 --- a/.github/workflows/crowdin-upload-sources.yml +++ b/.github/workflows/crowdin-upload-sources.yml @@ -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 }} diff --git a/.github/workflows/crowdin-upload-translations.yml b/.github/workflows/crowdin-upload-translations.yml index a1d649cc6..70f280e29 100644 --- a/.github/workflows/crowdin-upload-translations.yml +++ b/.github/workflows/crowdin-upload-translations.yml @@ -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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd36e8641..ba7c05642 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: diff --git a/.github/workflows/update-firmware-releases-list.yml b/.github/workflows/update-firmware-releases-list.yml index 6ba6f28f6..d12d09060 100644 --- a/.github/workflows/update-firmware-releases-list.yml +++ b/.github/workflows/update-firmware-releases-list.yml @@ -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 diff --git a/.github/workflows/update-hardware-list.yml b/.github/workflows/update-hardware-list.yml index 15dfa7f5e..cdb3c713c 100644 --- a/.github/workflows/update-hardware-list.yml +++ b/.github/workflows/update-hardware-list.yml @@ -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