From 31783e2da9365d2ee837ef25044a56e5a116201c Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Fri, 25 Feb 2022 18:23:59 -0500 Subject: [PATCH] Use multiple zips (#5350) --- .github/workflows/release.yml | 19 ++++++++++++++++--- composer.json | 14 ++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7b8de4bcdf..3339d3f3d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,8 +21,11 @@ jobs: - name: Compile frontend assets run: npm run frontend-prod - - name: Create zip - run: cd resources && tar -czvf dist.tar.gz dist dist-frontend + - name: Create dist zip + run: cd resources && tar -czvf dist.tar.gz dist + + - name: Create dist-frontend zip + run: cd resources && tar -czvf dist-frontend.tar.gz dist-frontend - name: Get Changelog id: changelog @@ -41,7 +44,7 @@ jobs: body: ${{ steps.changelog.outputs.text }} prerelease: true - - name: Upload zip to release + - name: Upload dist zip to release uses: actions/upload-release-asset@v1.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -50,3 +53,13 @@ jobs: asset_path: ./resources/dist.tar.gz asset_name: dist.tar.gz asset_content_type: application/tar+gz + + - name: Upload dist-frontend zip to release + uses: actions/upload-release-asset@v1.0.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./resources/dist-frontend.tar.gz + asset_name: dist-frontend.tar.gz + asset_content_type: application/tar+gz diff --git a/composer.json b/composer.json index aedfe5177c..79ba59e364 100644 --- a/composer.json +++ b/composer.json @@ -49,10 +49,16 @@ } }, "extra": { - "download-dist": { - "url": "https://github.com/statamic/cms/releases/download/{$version}/dist.tar.gz", - "path": "resources" - }, + "download-dist": [ + { + "url": "https://github.com/statamic/cms/releases/download/{$version}/dist.tar.gz", + "path": "resources/dist" + }, + { + "url": "https://github.com/statamic/cms/releases/download/{$version}/dist-frontend.tar.gz", + "path": "resources/dist-frontend" + } + ], "laravel": { "providers": [ "Statamic\\Providers\\StatamicServiceProvider"