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

handle branch rename from develop to main in github actions #2748

Merged
merged 1 commit into from
Oct 2, 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
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/release-checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Release captain responsible - <@gh_username>
- [Do we need to update the `dask` versions in the `nebari-dask`?](/~https://github.com/conda-forge/nebari-dask-feedstock/blob/main/recipe/meta.yaml#L13-L16)
- Will there be an accompanying blog post?
- [ ] Prepare for the release.
- [ ] Update the [`nebari upgrade`](/~https://github.com/nebari-dev/nebari/blob/develop/src/_nebari/upgrade.py) for this release
- [ ] Update the [`nebari upgrade`](/~https://github.com/nebari-dev/nebari/blob/main/src/_nebari/upgrade.py) for this release
- [ ] Add upgrade messaging including deprecation warnings, version specific warnings and so on.
- [ ] Optionally, announce a merge freeze.
- [ ] Release Candidate (RC) cycle.
Expand All @@ -65,7 +65,7 @@ _These steps must be actioned in the order they appear in this checklist._

- [ ] [Tag, build and push docker images](/~https://github.com/nebari-dev/nebari-docker-images/releases/new)
- [ ] [Update and cut release for `nebari-dask` meta package on Conda-Forge.](/~https://github.com/conda-forge/nebari-dask-feedstock)
- [ ] Update `CURRENT_RELEASE` (and any other tags) in the [`constants.py`](/~https://github.com/nebari-dev/nebari/blob/develop/src/_nebari/constants.py#L1)
- [ ] Update `CURRENT_RELEASE` (and any other tags) in the [`constants.py`](/~https://github.com/nebari-dev/nebari/blob/main/src/_nebari/constants.py#L1)
- [ ] [Cut PyPI release via GHA release workflow.](/~https://github.com/nebari-dev/nebari/releases/new)
- Avoid appending `v` to tag.
- Copy release notes from `RELEASE.md`.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_aws_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:

env:
AWS_DEFAULT_REGION: "us-west-2"
NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'develop' }}
NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'main' }}
NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }}
TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }}∏

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_azure_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ on:
- error

env:
NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'develop' }}
NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'main' }}
NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }}
TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_do_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ on:
- error

env:
NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'develop' }}
NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'main' }}
NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }}
TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_gcp_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ on:
- error

env:
NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'develop' }}
NEBARI_GH_BRANCH: ${{ github.event.inputs.branch || 'main' }}
NEBARI_IMAGE_TAG: ${{ github.event.inputs.image-tag || 'main' }}
TF_LOG: ${{ github.event.inputs.tf-log-level || 'info' }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_local_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ jobs:
# Since this is not critical for most pull requests and takes more than half of the time
# in the CI, it makes sense to only run on merge to main or workflow_dispatch to speed
# up feedback cycle
if: github.ref_name == 'develop' || github.event_name == 'workflow_dispatch'
if: github.ref_name == 'main' || github.event_name == 'workflow_dispatch'
working-directory: local-deployment
run: |
nebari destroy --config nebari-config.yaml --disable-prompt
4 changes: 2 additions & 2 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ name: Code Scanning

on:
push:
branches: [ "develop", "release/*" ]
branches: [ "main", "release/*" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "develop" ]
branches: [ "main" ]
schedule:
- cron: '19 23 * * 6'

Expand Down