From 972189c50f73480310966c06c9caa4ac739a8754 Mon Sep 17 00:00:00 2001 From: Brian Mesick Date: Mon, 13 May 2024 15:11:21 -0400 Subject: [PATCH] chore: Update automation for new default branch We moved from "main" to "nightly" to better match Tutor standard release branch naming conventions. --- .github/workflows/bump-version.yaml | 2 +- .github/workflows/pull-translations.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/test.yml | 4 ++-- .github/workflows/upgrade-python-requirements.yml | 4 ++-- catalog-info.yaml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bump-version.yaml b/.github/workflows/bump-version.yaml index c6cbb2973..ed6aa042f 100644 --- a/.github/workflows/bump-version.yaml +++ b/.github/workflows/bump-version.yaml @@ -67,7 +67,7 @@ jobs: title: "chore: preparing release ${{ steps.tag_version.outputs.new_version }}" commit-message: "chore: preparing release ${{ steps.tag_version.outputs.new_version }}" branch: "bot/v${{steps.tag_version.outputs.new_version}}" - base: main + base: nightly body: | Automated version bump for release ${{ steps.tag_version.outputs.new_version }}. diff --git a/.github/workflows/pull-translations.yaml b/.github/workflows/pull-translations.yaml index bfd09e9c3..8f910e4be 100644 --- a/.github/workflows/pull-translations.yaml +++ b/.github/workflows/pull-translations.yaml @@ -45,7 +45,7 @@ jobs: branch: "bot/translations/${{ steps.date.outputs.date }}" add-paths: | tutoraspects/ - base: main + base: nightly body: | Automated update of translations for assets on ${{ steps.date.outputs.date }}. diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9d654bb79..3391cc60d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -4,7 +4,7 @@ on: types: - closed branches: - - main + - nightly env: TUTOR_ROOT: ./.ci/ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 229e67c6b..bd13f9ab5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,9 +2,9 @@ name: Run all tests & checks on: push: - branches: [ main ] + branches: [ nightly ] pull_request: - branches: [ main ] + branches: [ nightly ] jobs: tests: diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index 10a1b3cc9..366dc8cf4 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -8,13 +8,13 @@ on: branch: description: "Target branch against which to create requirements PR" required: true - default: 'main' + default: 'nightly' jobs: call-upgrade-python-requirements-workflow: uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master with: - branch: ${{ github.event.inputs.branch || 'main' }} + branch: ${{ github.event.inputs.branch || 'nightly' }} # optional parameters below; fill in if you'd like github or email notifications # user_reviewers: "" # team_reviewers: "" diff --git a/catalog-info.yaml b/catalog-info.yaml index 97b13230d..c48451a57 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -14,7 +14,7 @@ metadata: # names that might be interested in changes to the architecture of this # component. openedx.org/arch-interest-groups: "group:openedx/tutor-contrib-aspects-maintainers," - openedx.org/release: "main" + openedx.org/release: "nightly" spec: # (Required) This can be a group (`group:`) or a user (`user:`).