From b0897367fc59230ccc07b2417478d1cfd64c1216 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 15 Mar 2024 09:13:37 +0100 Subject: [PATCH] Bug 1883651 - turn off cron and workflows on `main` (#5898) * Bug 1883651 - turn off cron and workflows on `main` Only keep the geckoview bump (for now), to still pick up mozilla-central changes over the weekend. * Bug 1883651 - move import-l10n to beta branch, remove sync-strings workflows For the 124 beta cycle, we'll import strings directly to that branch, since main will no longer be getting updates after the migration to m-c. --- .cron.yml | 8 +-- .github/workflows/ac-sync-strings.yml | 52 ------------------- .github/workflows/fenix-sync-strings.yml | 52 ------------------- .../fenix-update-nimbus-experiments.yml | 2 - .github/workflows/focus-sync-strings.yml | 52 ------------------- .../focus-update-nimbus-experiments.yml | 2 - .github/workflows/import-l10n.yml | 9 ++-- 7 files changed, 8 insertions(+), 169 deletions(-) delete mode 100644 .github/workflows/ac-sync-strings.yml delete mode 100644 .github/workflows/fenix-sync-strings.yml delete mode 100644 .github/workflows/focus-sync-strings.yml diff --git a/.cron.yml b/.cron.yml index c6bd6fbd67f1..f1186f744b0b 100644 --- a/.cron.yml +++ b/.cron.yml @@ -9,17 +9,13 @@ jobs: type: decision-task treeherder-symbol: nightly-D target-tasks-method: nightly - when: - - {hour: 4, minute: 0} - - {hour: 16, minute: 0} + when: [] - name: nightly-test job: type: decision-task treeherder-symbol: Nt target-tasks-method: nightly-test - when: - - {hour: 5, minute: 0} - - {hour: 16, minute: 0} + when: [] - name: screenshots job: type: decision-task diff --git a/.github/workflows/ac-sync-strings.yml b/.github/workflows/ac-sync-strings.yml deleted file mode 100644 index 364cbc4b34bd..000000000000 --- a/.github/workflows/ac-sync-strings.yml +++ /dev/null @@ -1,52 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/ - -name: AC - Uplift Strings - -on: - schedule: - - cron: "0 2 * * *" - workflow_dispatch: - -jobs: - main: - name: Uplift strings - runs-on: ubuntu-latest - steps: - - name: Discover A-C beta version - id: discover-beta-version - uses: mozilla-mobile/fenix-beta-version@4.2.3 - - name: Skip non-beta versions - uses: andymckay/cancel-action@0.2 - if: ${{ steps.discover-beta-version.outputs.beta_version == '' }} - - name: Store ENV variables - id: env-variables - run: | - echo "beta_branch=releases_v${{ steps.discover-beta-version.outputs.beta_version }}" >> $GITHUB_OUTPUT - - name: Checkout main branch - uses: actions/checkout@v3 - with: - path: main - ref: main - - name: Checkout beta branch - uses: actions/checkout@v3 - with: - path: beta - ref: ${{ steps.env-variables.outputs.beta_branch }} - - name: Sync strings - uses: mozilla-mobile/sync-strings-action@3.0.1 - with: - toml_path: android-components/l10n.toml - src: main - dest: beta - - name: Create pull request - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - path: beta - branch: automation/uplift-ac-strings-${{ steps.discover-beta-version.outputs.beta_version }} - author: github-actions[bot] - commit-message: "Uplift AC strings from ${{ github.ref_name }} to ${{ steps.env-variables.outputs.beta_branch }}" - title: "Uplift AC strings from ${{ github.ref_name }} to ${{ steps.env-variables.outputs.beta_branch }}" - body: "This (automated) PR uplifts strings from `${{ github.ref_name }}` to `${{ steps.env-variables.outputs.beta_branch }}`" diff --git a/.github/workflows/fenix-sync-strings.yml b/.github/workflows/fenix-sync-strings.yml deleted file mode 100644 index 6b6f16432638..000000000000 --- a/.github/workflows/fenix-sync-strings.yml +++ /dev/null @@ -1,52 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/ - -name: Fenix - Uplift Strings - -on: - schedule: - - cron: "0 2 * * *" - workflow_dispatch: - -jobs: - main: - name: Uplift strings - runs-on: ubuntu-latest - steps: - - name: Discover Fenix beta version - id: discover-beta-version - uses: mozilla-mobile/fenix-beta-version@4.2.3 - - name: Skip non-beta versions - uses: andymckay/cancel-action@0.2 - if: ${{ steps.discover-beta-version.outputs.beta_version == '' }} - - name: Store ENV variables - id: env-variables - run: | - echo "beta_branch=releases_v${{ steps.discover-beta-version.outputs.beta_version }}" >> $GITHUB_OUTPUT - - name: Checkout main branch - uses: actions/checkout@v3 - with: - path: main - ref: main - - name: Checkout beta branch - uses: actions/checkout@v3 - with: - path: beta - ref: ${{ steps.env-variables.outputs.beta_branch }} - - name: Sync strings - uses: mozilla-mobile/sync-strings-action@3.0.1 - with: - toml_path: fenix/l10n.toml - src: main - dest: beta - - name: Create pull request - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - path: beta - branch: automation/uplift-fenix-strings-${{ steps.discover-beta-version.outputs.beta_version }} - author: github-actions[bot] - commit-message: "Uplift Fenix strings from ${{ github.ref_name }} to ${{ steps.env-variables.outputs.beta_branch }}" - title: "Uplift Fenix strings from ${{ github.ref_name }} to ${{ steps.env-variables.outputs.beta_branch }}" - body: "This (automated) PR uplifts strings from `${{ github.ref_name }}` to `${{ steps.env-variables.outputs.beta_branch }}`" diff --git a/.github/workflows/fenix-update-nimbus-experiments.yml b/.github/workflows/fenix-update-nimbus-experiments.yml index 8359b65eb802..96a8a3530c8b 100644 --- a/.github/workflows/fenix-update-nimbus-experiments.yml +++ b/.github/workflows/fenix-update-nimbus-experiments.yml @@ -5,8 +5,6 @@ name: "Fenix - Update Nimbus Experiments" on: - schedule: - - cron: '*/30 * * * *' workflow_dispatch: {} jobs: diff --git a/.github/workflows/focus-sync-strings.yml b/.github/workflows/focus-sync-strings.yml deleted file mode 100644 index 0cdbb306d78c..000000000000 --- a/.github/workflows/focus-sync-strings.yml +++ /dev/null @@ -1,52 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/ - -name: Focus - Uplift Strings - -on: - schedule: - - cron: "0 2 * * *" - workflow_dispatch: - -jobs: - main: - name: Uplift strings - runs-on: ubuntu-latest - steps: - - name: Discover Focus beta version - id: discover-beta-version - uses: mozilla-mobile/fenix-beta-version@4.2.3 - - name: Skip non-beta versions - uses: andymckay/cancel-action@0.2 - if: ${{ steps.discover-beta-version.outputs.beta_version == '' }} - - name: Store ENV variables - id: env-variables - run: | - echo "beta_branch=releases_v${{ steps.discover-beta-version.outputs.beta_version }}" >> $GITHUB_OUTPUT - - name: Checkout main branch - uses: actions/checkout@v3 - with: - path: main - ref: main - - name: Checkout beta branch - uses: actions/checkout@v3 - with: - path: beta - ref: ${{ steps.env-variables.outputs.beta_branch }} - - name: Sync strings - uses: mozilla-mobile/sync-strings-action@3.0.1 - with: - toml_path: focus-android/l10n.toml - src: main - dest: beta - - name: Create pull request - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - path: beta - branch: automation/uplift-focus-strings-${{ steps.discover-beta-version.outputs.beta_version }} - author: github-actions[bot] - commit-message: "Uplift Focus strings from ${{ github.ref_name }} to ${{ steps.env-variables.outputs.beta_branch }}" - title: "Uplift Focus strings from ${{ github.ref_name }} to ${{ steps.env-variables.outputs.beta_branch }}" - body: "This (automated) PR uplifts strings from `${{ github.ref_name }}` to `${{ steps.env-variables.outputs.beta_branch }}`" diff --git a/.github/workflows/focus-update-nimbus-experiments.yml b/.github/workflows/focus-update-nimbus-experiments.yml index 75d67aabb326..e3c764df148f 100644 --- a/.github/workflows/focus-update-nimbus-experiments.yml +++ b/.github/workflows/focus-update-nimbus-experiments.yml @@ -5,8 +5,6 @@ name: "Focus - Update Nimbus Experiments" on: - schedule: - - cron: '*/30 * * * *' workflow_dispatch: {} jobs: diff --git a/.github/workflows/import-l10n.yml b/.github/workflows/import-l10n.yml index 4715a237c1d2..fd287d630146 100644 --- a/.github/workflows/import-l10n.yml +++ b/.github/workflows/import-l10n.yml @@ -18,11 +18,14 @@ jobs: name: Import strings runs-on: ubuntu-latest steps: - - name: Checkout Main Branch + - name: Discover A-C beta version + id: discover-beta-version + uses: mozilla-mobile/fenix-beta-version@4.2.3 + - name: Checkout Beta Branch uses: actions/checkout@v3 with: path: "source" - ref: main + ref: releases_v${{ steps.discover-beta-version.outputs.beta_version }} - name: Clone android-l10n repository uses: actions/checkout@v3 with: @@ -74,7 +77,7 @@ jobs: echo "Link: $pr_link" else echo "Opening new pull request." - gh pr create --fill + gh pr create --fill --base releases_v${{ steps.discover-beta-version.outputs.beta_version }} fi else echo "No changes found."