Skip to content

Commit a97cc38

Browse files
authored
v1.1.0
1 parent 923f0c2 commit a97cc38

File tree

8 files changed

+65
-44
lines changed

8 files changed

+65
-44
lines changed

.circleci/config.yml

-29
This file was deleted.

.gitattributes

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
/.gitattributes export-ignore
22
/.github export-ignore
3-
/.circleci export-ignore

.github/workflows/Main.yml

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Main
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
11+
jobs:
12+
php:
13+
name: PHP ${{ matrix.php }}
14+
runs-on: ubuntu-latest
15+
if: "!contains(github.event.head_commit.message, '[ci skip]')"
16+
strategy:
17+
matrix:
18+
php: ["7.4", "8.0"]
19+
20+
steps:
21+
- name: Checkout the project
22+
uses: actions/checkout@v2
23+
24+
- name: Setup the PHP ${{ matrix.php }} environment on ${{ runner.os }}
25+
uses: shivammathur/setup-php@v2
26+
with:
27+
php-version: ${{ matrix.php }}
28+
coverage: xdebug
29+
env:
30+
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
32+
- name: Restore the Composer cache directory
33+
id: composercache
34+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
35+
36+
- uses: actions/cache@v2
37+
with:
38+
path: ${{ steps.composercache.outputs.dir }}
39+
key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
40+
restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer-
41+
42+
- name: Install Composer dependencies
43+
run: composer install --no-progress --prefer-dist --optimize-autoloader --no-suggest
44+
45+
- name: Execute the PHP lint script
46+
run: composer run-script lint

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Sage SVG
22

33
[![Latest Stable Version](https://poser.pugx.org/log1x/sage-svg/v/stable)](https://packagist.org/packages/log1x/sage-svg)
4-
![CircleCI](https://img.shields.io/circleci/build/gh/Log1x/sage-svg.svg?style=flat-square)
4+
![Build Status](https://img.shields.io/github/workflow/status/log1x/sage-svg/Main?style=flat-square)
55
[![Total Downloads](https://poser.pugx.org/log1x/sage-svg/downloads)](https://packagist.org/packages/log1x/sage-svg)
66

77
Sage SVG is a simple package for using inline SVGs in your Sage 10 projects.
88

99
## Requirements
1010

1111
- [Sage](https://github.com/roots/sage) >= 10.0
12-
- [PHP](https://secure.php.net/manual/en/install.php) >= 7.2.5
12+
- [PHP](https://secure.php.net/manual/en/install.php) >= 7.4
1313
- [Composer](https://getcomposer.org/download/)
1414

1515
## Installation

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
]
2727
},
2828
"require": {
29-
"php": ">=7.2.5"
29+
"php": "^7.4|^8.0"
3030
},
3131
"require-dev": {
3232
"squizlabs/php_codesniffer": "^3.5"

composer.lock

+13-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/svg.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
use function Roots\base_path;
3+
use function Roots\public_path;
44

55
return [
66

@@ -15,7 +15,7 @@
1515
|
1616
*/
1717

18-
'path' => base_path('dist'),
18+
'path' => public_path(),
1919

2020
/*
2121
|--------------------------------------------------------------------------

src/SageSvgServiceProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function boot()
4444
protected function config()
4545
{
4646
return collect([
47-
'path' => $this->app->basePath('dist')
47+
'path' => $this->app->publicPath()
4848
])
4949
->merge($this->app->config->get('svg', []))
5050
->all();

0 commit comments

Comments
 (0)