Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update automation for new default branch #809

Merged
merged 1 commit into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/bump-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}.

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-translations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}.

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
types:
- closed
branches:
- main
- nightly

env:
TUTOR_ROOT: ./.ci/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Run all tests & checks

on:
push:
branches: [ main ]
branches: [ nightly ]
pull_request:
branches: [ main ]
branches: [ nightly ]

jobs:
tests:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/upgrade-python-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion catalog-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on @kdmccormick PR, I think we are going to remove this tag: #810

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's already tagged for redwood, and we still have some things to talk about around this so I'd like to get this merged and remove the tag later if we need to.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

spec:

# (Required) This can be a group (`group:<github_group_name>`) or a user (`user:<github_username>`).
Expand Down