diff --git a/.github/ISSUE_TEMPLATE/release-checklist.md b/.github/ISSUE_TEMPLATE/release-checklist.md index 3e6259cefc..72d2c369cc 100644 --- a/.github/ISSUE_TEMPLATE/release-checklist.md +++ b/.github/ISSUE_TEMPLATE/release-checklist.md @@ -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. @@ -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`. diff --git a/.github/workflows/test_aws_integration.yaml b/.github/workflows/test_aws_integration.yaml index 3c8a0d04af..867006df20 100644 --- a/.github/workflows/test_aws_integration.yaml +++ b/.github/workflows/test_aws_integration.yaml @@ -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' }}∏ diff --git a/.github/workflows/test_azure_integration.yaml b/.github/workflows/test_azure_integration.yaml index c1eb477c7b..8123907497 100644 --- a/.github/workflows/test_azure_integration.yaml +++ b/.github/workflows/test_azure_integration.yaml @@ -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' }} diff --git a/.github/workflows/test_do_integration.yaml b/.github/workflows/test_do_integration.yaml index d9ef1a7b45..95ad219a85 100644 --- a/.github/workflows/test_do_integration.yaml +++ b/.github/workflows/test_do_integration.yaml @@ -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' }} diff --git a/.github/workflows/test_gcp_integration.yaml b/.github/workflows/test_gcp_integration.yaml index 7520cadf1a..e0e5a5b9e9 100644 --- a/.github/workflows/test_gcp_integration.yaml +++ b/.github/workflows/test_gcp_integration.yaml @@ -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' }} diff --git a/.github/workflows/test_local_integration.yaml b/.github/workflows/test_local_integration.yaml index 945f14ae26..3b51f5797f 100644 --- a/.github/workflows/test_local_integration.yaml +++ b/.github/workflows/test_local_integration.yaml @@ -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 diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 2a8bf120fa..8c894653b9 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -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'