Skip to content

Commit 4c3d353

Browse files
authored
Merge pull request #75 from ember-learn/upgrade-percy-exec-action
Upgraded percy/exec-action to v0.3.1
2 parents a9f38f3 + 2fa88d1 commit 4c3d353

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

.github/workflows/ci-cd.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI/CD
22

3-
on:
3+
on:
44
push:
55
branches:
66
- master
@@ -79,7 +79,7 @@ jobs:
7979
if: steps.cache-dependencies.outputs.cache-hit != 'true'
8080

8181
- name: Test
82-
uses: percy/exec-action@v0.3.0
82+
uses: percy/exec-action@v0.3.1
8383
with:
8484
custom-command: yarn test
8585
env:
@@ -93,20 +93,19 @@ jobs:
9393
needs: [lint, test-app]
9494
runs-on: ubuntu-latest
9595
timeout-minutes: 5
96-
if: success() && github.ref == 'refs/heads/master' && github.event_name == 'push'
96+
# Only run on pushes to main branch that aren't from the cron workflow
97+
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
9798
steps:
9899
- name: Check out a copy of the repo
99100
uses: actions/checkout@v2
100101

101-
- name: Setup Git
102+
- name: Set up Git user
102103
run: |
103-
# Setup a Git user for committing
104+
# Set up a Git user for committing
104105
git config --global user.name "GitHub Actions"
105106
git config --global user.email "actions@users.noreply.github.com"
106107
107-
# Copy the Git Auth from the local repository
108-
# https://github.com/actions/checkout/blob/61b9e3751b92087fd0b06925ba6dd6314e06f089/src/git-auth-helper.ts#L69-L76
109-
# https://github.com/actions/checkout/blob/61b9e3751b92087fd0b06925ba6dd6314e06f089/src/git-auth-helper.ts#L252-L278
108+
# Copy the Git Auth from the local config
110109
git config --global "http.https://github.com/.extraheader" \
111110
"$(git config --local --get http.https://github.com/.extraheader)"
112111

0 commit comments

Comments
 (0)