Browse Source

Point workflows to main (#378)

pull/385/head
Joseph Flinn 2 years ago committed by GitHub
parent
commit
11f5e2993a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .github/workflows/build.yml
  2. 2
      .github/workflows/release.yml
  3. 2
      .github/workflows/version-bump.yml

2
.github/workflows/build.yml

@ -627,7 +627,7 @@ jobs:
- macos-gui - macos-gui
steps: steps:
- name: Check if any job failed - name: Check if any job failed
if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') }} if: ${{ (github.ref == 'refs/heads/main') || (github.ref == 'refs/heads/rc') }}
env: env:
CLOC_STATUS: ${{ needs.cloc.result }} CLOC_STATUS: ${{ needs.cloc.result }}
SETUP_STATUS: ${{ needs.setup.result }} SETUP_STATUS: ${{ needs.setup.result }}

2
.github/workflows/release.yml

@ -71,7 +71,7 @@ jobs:
with: with:
workflow: build.yml workflow: build.yml
workflow_conclusion: success workflow_conclusion: success
branch: master branch: main
- name: Create release - name: Create release
if: ${{ github.event.inputs.release_type != 'Dry Run' }} if: ${{ github.event.inputs.release_type != 'Dry Run' }}

2
.github/workflows/version-bump.yml

@ -117,7 +117,7 @@ jobs:
TITLE: "Bump version to ${{ inputs.version_number }}" TITLE: "Bump version to ${{ inputs.version_number }}"
run: | run: |
PR_URL=$(gh pr create --title "$TITLE" \ PR_URL=$(gh pr create --title "$TITLE" \
--base "master" \ --base "main" \
--head "$PR_BRANCH" \ --head "$PR_BRANCH" \
--label "version update" \ --label "version update" \
--label "automated pr" \ --label "automated pr" \

Loading…
Cancel
Save