Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 3.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.lock
  • Loading branch information
andrey-helldar committed Dec 16, 2023
2 parents 0723848 + d87697e commit eb4c5cf
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
3 changes: 0 additions & 3 deletions .github/FUNDING.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
run: php ./codestyle app:build codestyle --build-version=${{ steps.tag.outputs.tag }} --ansi

- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: codestyle
path: builds/codestyle
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
- name: Remove old file
run: rm -f builds/codestyle

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: codestyle
path: builds
Expand All @@ -99,7 +99,7 @@ jobs:
- name: Remove old file
run: rm -f builds/codestyle

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: codestyle
path: builds
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-phar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
sudo php ./codestyle app:build codestyle.phar --build-version=${{ steps.tag.outputs.tag }}
- name: Upload the PHAR artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: codestyle.phar
path: builds/codestyle.phar
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Release Drafter

on:
push:
branches:
- main
workflow_dispatch:

jobs:
Update:
uses: TheDragonCode/.github/.github/workflows/release-drafter.yml@main
10 changes: 1 addition & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,14 @@
{
"name": "Andrey Helldar",
"email": "[email protected]",
"homepage": "https://github.com/andrey-helldar"
"homepage": "https://dragon-code.pro"
}
],
"support": {
"issues": "https://github.com/TheDragonCode/codestyler/issues",
"source": "https://github.com/TheDragonCode/codestyler"
},
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/TheDragonCode"
},
{
"type": "open_collective",
"url": "https://opencollective.com/dragon-code"
},
{
"type": "boosty",
"url": "https://boosty.to/dragon-code"
Expand Down

0 comments on commit eb4c5cf

Please sign in to comment.