Skip to content

Commit

Permalink
Fixes conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
richan-fongdasen committed Feb 13, 2022
2 parents 4b7ea01 + 9ce8656 commit 3553052
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Cache composer dependencies
uses: actions/cache@v2
env:
cache-name: cache-i18n-laravel-latest
cache-name: laravel-varnishable-composer-cache
with:
path: ~/.composer
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.json') }}
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
- name: Cache composer dependencies
uses: actions/cache@v2
env:
cache-name: cache-i18n-laravel-latest
cache-name: laravel-varnishable-composer-cache
with:
path: ~/.composer
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.json') }}
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/richan-fongdasen/laravel-varnishable.svg?branch=master)](https://travis-ci.org/richan-fongdasen/laravel-varnishable)
[![Build](https://github.com/richan-fongdasen/laravel-varnishable/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/richan-fongdasen/laravel-varnishable/actions/workflows/main.yml)
[![codecov](https://codecov.io/gh/richan-fongdasen/laravel-varnishable/branch/master/graph/badge.svg)](https://codecov.io/gh/richan-fongdasen/laravel-varnishable)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/richan-fongdasen/laravel-varnishable/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/richan-fongdasen/laravel-varnishable/?branch=master)
[![StyleCI Analysis Status](https://github.styleci.io/repos/135787392/shield?branch=master)](https://github.styleci.io/repos/135787392)
Expand Down

0 comments on commit 3553052

Please sign in to comment.