Skip to content

Commit

Permalink
v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Log1x authored Mar 11, 2022
1 parent 923f0c2 commit a97cc38
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 44 deletions.
29 changes: 0 additions & 29 deletions .circleci/config.yml

This file was deleted.

1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
/.gitattributes export-ignore
/.github export-ignore
/.circleci export-ignore
46 changes: 46 additions & 0 deletions .github/workflows/Main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Main

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
php:
name: PHP ${{ matrix.php }}
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
strategy:
matrix:
php: ["7.4", "8.0"]

steps:
- name: Checkout the project
uses: actions/checkout@v2

- name: Setup the PHP ${{ matrix.php }} environment on ${{ runner.os }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: xdebug
env:
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Restore the Composer cache directory
id: composercache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- uses: actions/cache@v2
with:
path: ${{ steps.composercache.outputs.dir }}
key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer-

- name: Install Composer dependencies
run: composer install --no-progress --prefer-dist --optimize-autoloader --no-suggest

- name: Execute the PHP lint script
run: composer run-script lint
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Sage SVG

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

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

## Requirements

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

## Installation
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
]
},
"require": {
"php": ">=7.2.5"
"php": "^7.4|^8.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "^3.5"
Expand Down
21 changes: 13 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions config/svg.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

use function Roots\base_path;
use function Roots\public_path;

return [

Expand All @@ -15,7 +15,7 @@
|
*/

'path' => base_path('dist'),
'path' => public_path(),

/*
|--------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/SageSvgServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function boot()
protected function config()
{
return collect([
'path' => $this->app->basePath('dist')
'path' => $this->app->publicPath()
])
->merge($this->app->config->get('svg', []))
->all();
Expand Down

0 comments on commit a97cc38

Please sign in to comment.