Skip to content

Commit

Permalink
GA: remove merging with upstream branch
Browse files Browse the repository at this point in the history
According to
actions/checkout#15 (comment), GA
when triggered by a pull request will check out the merged state of the
repo.

Also therefore no need to clone to depth greater than 1.
  • Loading branch information
stefanv committed Aug 20, 2020
1 parent 84c453a commit e193e54
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true

- name: Merge with master
run: |
git config --global user.email "[email protected]"
git config --global user.name "SkyPortal CI"
git merge origin/master
git submodule update
- name: Write SkyPortal configs
run: |
cat << EOF > config.yaml
Expand Down

0 comments on commit e193e54

Please sign in to comment.