Skip to content

Commit

Permalink
Merge pull request #723 from redwoodjs/dsp-update-gh-actions-main
Browse files Browse the repository at this point in the history
Updates GH Actions and RW Tasks to use Main as Triggers
  • Loading branch information
thedavidprice committed Jun 19, 2020
2 parents 49c3afe + c7fecc3 commit c1562f7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-eslint-jest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Lint, build and run tests

on:
push:
branches: [master]
branches: [main]
pull_request:
types: [opened, edited, synchronize, reopened]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/netlify-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Netlify deploy hook to add new docs on Redwoodjs.com
on:
push:
branches:
- master
- main
release:
types:
- published
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-npm-canary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Publish canaray packages to npm

on:
push:
branches: [master]
branches: [main]
tags-ignore:
- v**

Expand Down
2 changes: 1 addition & 1 deletion tasks/publish-canary
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# This publishes a "canary" version of our packages to npm.
# It is run when a branch is merged to master.
# It is run when a branch is merged to main.
# https://github.com/lerna/lerna/tree/master/commands/publish#--canary

yarn lerna publish --force-publish --canary --preid canary --dist-tag canary --yes

0 comments on commit c1562f7

Please sign in to comment.