diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 287188b713..7bb51c25cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,8 +2,7 @@ name: Build/Release Corso on: workflow_dispatch: # TODO(meain): post-merge: verify manual dispatch push: - # TODO(meain): update references to release-ci before merge - branches: [ release-ci ] + branches: [ main ] tags: [ 'v*.*.*' ] permissions: @@ -15,7 +14,7 @@ permissions: # cancel currently running jobs if a new version of the branch is pushed concurrency: - group: release-ci-${{ github.workflow }}-${{ github.ref }} + group: ci-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -24,7 +23,7 @@ jobs: # --- Prechecks and Checkouts ------------------------------------------------------------------------ # ---------------------------------------------------------------------------------------------------- Precheck: - uses: alcionai/corso/.github/workflows/_filechange_checker.yml@release-ci # TODO(meain): post-merge of docs-ci: change this to main + uses: alcionai/corso/.github/workflows/_filechange_checker.yml@main Checkout: needs: [Precheck] @@ -40,7 +39,7 @@ jobs: # the results will cascade onto both testing and linting. - name: Setup Golang with cache uses: ./.github/actions/go-setup-cache - if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/release-ci' || needs.precheck.outputs.docfileschanged == 'true' + if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || needs.precheck.outputs.docfileschanged == 'true' with: go-version-file: src/go.mod @@ -51,7 +50,7 @@ jobs: Generate-CLI-Docs: needs: [Precheck, Checkout] environment: Testing - if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/release-ci' || needs.precheck.outputs.srcfileschanged == 'true' + if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || needs.precheck.outputs.srcfileschanged == 'true' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -76,7 +75,7 @@ jobs: - uses: actions/upload-artifact@master name: Upload cli docs as artifacts - if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/release-ci' + if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' with: name: cli-docs path: docs/docs/cli @@ -89,7 +88,7 @@ jobs: needs: [Generate-CLI-Docs] environment: Testing runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/release-ci' || needs.precheck.outputs.docfileschanged == 'true' + if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || needs.precheck.outputs.docfileschanged == 'true' steps: - uses: actions/checkout@v3 @@ -119,7 +118,7 @@ jobs: needs: [Precheck, Checkout] environment: Testing runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/release-ci' || needs.precheck.outputs.srcfileschanged == 'true' + if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || needs.precheck.outputs.srcfileschanged == 'true' defaults: run: working-directory: src @@ -179,7 +178,7 @@ jobs: needs: [Precheck, Checkout] environment: Testing runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/release-ci' || needs.precheck.outputs.srcfileschanged == 'true' + if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' || needs.precheck.outputs.srcfileschanged == 'true' defaults: run: working-directory: src @@ -211,7 +210,7 @@ jobs: SetEnv: environment: Testing - if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/release-ci' + if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' runs-on: ubuntu-latest outputs: environment: ${{ steps.set-env.outputs.environment }} @@ -232,7 +231,7 @@ jobs: needs: [Test-Suite, Linting, Docs-Linting, SetEnv] environment: ${{ needs.SetEnv.outputs.environment }} runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/release-ci' + if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' defaults: run: working-directory: src @@ -266,7 +265,7 @@ jobs: needs: [Test-Suite, Linting, Docs-Linting, SetEnv] environment: ${{ needs.SetEnv.outputs.environment }} runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/release-ci' + if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' defaults: run: working-directory: docs @@ -306,7 +305,7 @@ jobs: needs: [Test-Suite, Linting, Docs-Linting, SetEnv] environment: ${{ needs.SetEnv.outputs.environment }} runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/release-ci' + if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main' defaults: run: working-directory: build