Skip to content

Commit 18e3739

Browse files
committed
fix: update github-ci
1 parent f4d5b8a commit 18e3739

File tree

2 files changed

+7
-37
lines changed

2 files changed

+7
-37
lines changed

.github/workflows/pack-plugin.yml

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,12 @@ env:
1010
PLUGIN_NAME: FroshPlatformThumbnailProcessor
1111
ACCOUNT_USER: ${{ secrets.ACCOUNT_USER }}
1212
ACCOUNT_PASSWORD: ${{ secrets.ACCOUNT_PASSWORD }}
13-
PLUGIN_UPLOADER_VERSION: 0.3.2
1413

1514
jobs:
16-
CreateZip:
15+
pack:
1716
runs-on: ubuntu-latest
18-
container: ghcr.io/friendsofshopware/platform-plugin-dev:v6.3.2
17+
container: ghcr.io/friendsofshopware/platform-plugin-dev:v6.3.4
1918
steps:
20-
- name: Get the version
21-
id: get_version
22-
run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
23-
2419
- name: Checkout
2520
uses: actions/checkout@v2.3.1
2621
with:
@@ -31,47 +26,22 @@ jobs:
3126
npm install --prefix "./${PLUGIN_NAME}/src/Resources/app/storefront/"
3227
cp -r "./${PLUGIN_NAME}" "/plugins/${PLUGIN_NAME}"
3328
start-mysql
29+
plugin-uploader ext:prepare /plugins/${PLUGIN_NAME}/
3430
pack-plugin "${PLUGIN_NAME}"
35-
3631
- name: Upload Artefact
3732
uses: actions/upload-artifact@v2
3833
with:
3934
name: ${{ env.PLUGIN_NAME }}
4035
path: ${{ env.PLUGIN_NAME }}.zip
4136

42-
- name: getPluginUploader
43-
run: wget 'https://github.com/FriendsOfShopware/FroshPluginUploader/releases/download/${{ env.PLUGIN_UPLOADER_VERSION }}/frosh-plugin-upload.phar' -O frosh-plugin-upload.phar
44-
4537
- name: Validate Zip
46-
run: php frosh-plugin-upload.phar ext:validate $(pwd)/${PLUGIN_NAME}.zip
38+
run: plugin-uploader ext:validate $(pwd)/${PLUGIN_NAME}.zip
4739

4840
- name: Update store informations
49-
run: php frosh-plugin-upload.phar ext:update $(pwd)/${PLUGIN_NAME}/
41+
run: plugin-uploader ext:update $(pwd)/${PLUGIN_NAME}/
5042

5143
- name: Upload to store
5244
if: startsWith(github.ref, 'refs/tags/')
53-
run: php frosh-plugin-upload.phar ext:upload $(pwd)/${PLUGIN_NAME}.zip
54-
55-
- name: Create Release in github
56-
if: startsWith(github.ref, 'refs/tags/')
57-
id: create_release
58-
uses: actions/create-release@v1.0.0
45+
run: plugin-uploader ext:upload $(pwd)/${PLUGIN_NAME}.zip --createRelease
5946
env:
6047
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61-
with:
62-
tag_name: ${{ steps.get_version.outputs.VERSION }}
63-
release_name: ${{ steps.get_version.outputs.VERSION }}
64-
draft: false
65-
prerelease: false
66-
67-
- name: Upload Release Asset to github
68-
if: startsWith(github.ref, 'refs/tags/')
69-
id: upload_release_asset
70-
uses: actions/upload-release-asset@v1.0.2
71-
env:
72-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
73-
with:
74-
upload_url: ${{ steps.create_release.outputs.upload_url }}
75-
asset_path: ${{ env.PLUGIN_NAME }}.zip
76-
asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.get_version.outputs.VERSION }}.zip
77-
asset_content_type: application/zip

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
],
2323
"require": {
24-
"shopware/core": "~6.3"
24+
"shopware/core": "~6.3|~6.4"
2525
},
2626
"extra": {
2727
"shopware-plugin-class": "Frosh\\ThumbnailProcessor\\FroshPlatformThumbnailProcessor",

0 commit comments

Comments
 (0)